diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/lxd/ui.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/qovery-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/mods/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/vector/Cargo.lock | 24 | ||||
-rw-r--r-- | pkgs/tools/misc/vector/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/croc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/nix/nixdoc/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/package-management/apk-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/mdcat/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/typesetting/asciidoctorj/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 41 |
15 files changed, 70 insertions, 68 deletions
diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index afcb062630a5..138e99d26890 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; + hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; + hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 8db9f115c4d8..f7a0eb41a3df 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.84.1"; + version = "0.84.3"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Dq62LXa0hZrpfQ7WQuCelLxWS7Lhn6SH61cNTsYI/mw="; + hash = "sha256-rDQFt5P+Clp0JCCTG/2r69ZGiXXk3OM+rJfJ6HSKOBo="; }; vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o="; diff --git a/pkgs/tools/misc/mods/default.nix b/pkgs/tools/misc/mods/default.nix index fda8944c330f..33cc3dd3e133 100644 --- a/pkgs/tools/misc/mods/default.nix +++ b/pkgs/tools/misc/mods/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mods"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-ZWH3YuN1cmdw96/HVzsp1u70ziUfupUeBjJiNI5a538="; + hash = "sha256-ecmfWnrd9gwIEGAOIcOeUnfmkKmq9dLxpKqAHJemhvU="; }; - vendorHash = "sha256-PgaxqfgtwBYnzyL2F/OPJP1rdmLOtBCTKEPhMgvC6XA="; + vendorHash = "sha256-pJ31Lsa5VVix3BM4RrllQA3MJ/JeNIKfQ8RClyFfXCI="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 41193aa9a014..6bc92235ea6c 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -4925,9 +4925,9 @@ dependencies = [ [[package]] name = "lockfree-object-pool" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee33defb27b106378a6efcfcde4dda6226dfdac8ba7a2904f5bc93363cb88557" +checksum = "3a69c0481fc2424cb55795de7da41add33372ea75a94f9b6588ab6a2826dfebc" [[package]] name = "log" @@ -5234,9 +5234,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -9816,7 +9816,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.36.0" +version = "0.36.1" dependencies = [ "apache-avro", "approx", @@ -9839,6 +9839,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-sns", "aws-sdk-sqs", + "aws-sdk-sts", "aws-sigv4", "aws-smithy-async", "aws-smithy-http", @@ -10539,6 +10540,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10677,11 +10684,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 0540bcac517b..2a0b8dbba75f 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.36.0"; + version = "0.36.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw="; + hash = "sha256-iY0Bi1FG3kEiZtPTXonoVGYiquZkTPF51PWEZEoxQSw="; }; cargoLock = { diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index de3c44608655..f6a16b11b54b 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.13"; + version = "9.6.14"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uuE3Ci0JeWhYMHj5xO5UNZR4BOuaD15nMqFQFZIQCkY="; + sha256 = "sha256-0FtzPjaWJ1Q94rsx2WF7n24mQu2IsVBSQfddbPzQZ84="; }; - vendorHash = "sha256-pUWUYV1Ts/dFXUzufIWt5ETRQVpxIGzxRFq9jviG0Fs="; + vendorHash = "sha256-IsecKLKPJgM4IoKAn8k8ipSWamdTVXcfF9V3r87eApE="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index e13e9cb92731..770c735494f5 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,15 +18,15 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.5p1"; + version = "9.7p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs="; + hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0="; }; - extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in + extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in [ ./ssh-keysign-8.5.patch @@ -36,7 +36,7 @@ in inherit url; stripLen = 1; excludes = [ "channels.c" ]; - hash = "sha256-hYB3i0ifNOgGLYwElMJFcT+ktczLKciq3qw1tTHZHcc="; + hash = "sha256-MydulQvz8sDVQ6Up9U1yrsiyI5EGmyKl/stUk7DvVOU="; }) (fetchpatch { diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 1d5014a1c700..671e4891d8b1 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-PnvVGw0DMBg/l7+QpcXW5AFfR6MeXBiUYdVAZuue1jA="; + sha256 = "sha256-V3MAvbdYk3DL064UYcJE9HmwfQBwpMxVXWiAKX6honA="; }; - cargoHash = "sha256-qLTUyhoEVtjgh+ilEv+pQLXLYWlW9gVsCiA5rPfymZY="; + cargoHash = "sha256-RFxTjLiJCEc42Mb8rcayOFHkYk2GfpgsO3+hAaRwHgs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -22,6 +22,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ infinisil asymmetric + hsjobeki ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 4a460adfd0ff..4800a6641bd0 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-NbADp017wL6h+Owg/GISidoXEq0seWaa98/Hyyq6pYc="; + sha256 = "sha256-gO7Yf60eabvAdPDSzxvxeEMsvc6ixy1iQ6/o7WWlE2Q="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index d0840d206b67..19080e22ed3d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -42,6 +42,7 @@ in , docbook5 , editline , flex +, git , gnutar , gtest , gzip @@ -54,6 +55,7 @@ in , libxml2 , libxslt , lowdown +, man , mdbook , mdbook-linkcheck , nlohmann_json @@ -142,6 +144,11 @@ self = stdenv.mkDerivation { aws-sdk-cpp ]; + installCheckInputs = lib.optionals atLeast221 [ + git + man + ]; + propagatedBuildInputs = [ boehmgc ] ++ lib.optionals (atLeast27) [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 92c988ea5d08..f5f2b81f6532 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -263,6 +263,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-bfFe38BkoQws7om4gBtBWoNTLkt9piMXdLLoHYl+vBQ="; }; + nix_2_21 = common { + version = "2.21.0"; + hash = "sha256-9b9qJ+7rGjLKbIswMf0/2pgUWH/xOlYLk7P4WYNcGDs="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available @@ -282,7 +287,7 @@ in lib.makeExtensible (self: ({ stable = addFallbackPathsCheck self.nix_2_18; - unstable = self.nix_2_20; + unstable = self.nix_2_21; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 18cec1f08c12..93901742c6ad 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-09"; + version = "2024-03-11"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IkCswvoCEqlTckXILYToXpIJpHM7MIcVK1MySAJK63A="; + hash = "sha256-tL/ff2XZdGM8lfpfw8tSr2HTOVZCEAWNOdjV/mnZNtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 6fa512c39bf3..a928b74a1518 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-2ThjIv77kdjHyOpGcQplYZXPdu+cN4oBnyHRGptN7f4="; + hash = "sha256-qdNORp9THxHWR95uVcYtCy59OQqdop1012thZN5i64w="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-y828L8HHkFeem/76yizQWX7DpCGQP+HzJP+pQnxAn70="; + cargoHash = "sha256-/avxRvT35LxCBWkTYJDCtdd95VC67epZIPCMv994uBo="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index fd2bc2eabdb8..ac9abf1924c0 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.5.11"; + version = "2.5.12"; src = fetchzip { url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "sha256-Eagq8a6xTMonaiyhuuHc47pD8gE6jqWx7cZ3xJykmeQ="; + sha256 = "sha256-cpFY9nEqy7yBevupHMpNybqnAfN2fT9RcSKWlRdWsag="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 46ec52f75d84..7aa75106a611 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -322,44 +322,25 @@ context = stdenv.mkDerivation rec { }; }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "dvisvgm"; - inherit (texlive.pkgs.dvisvgm) version; + version = "3.1.2"; - inherit (common) src; + src = assert lib.assertMsg (version == texlive.pkgs.dvisvgm.version) "dvisvgm: TeX Live version (${texlive.pkgs.dvisvgm.version}) different from source (${version}), please update dvisvgm"; fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + hash = "sha256-vqeDrf6TG3eUoMMNeQK4Kw1NmtaBbc2KCVqTHNM+rPY="; + }; - patches = [ - # do not use deprecated NEWPDF option with Ghostscript >= 10.02.0 - # https://github.com/mgieseki/dvisvgm/issues/245 - (fetchpatch { - name = "dont-use-NEWPDF-with-GS-10.02.0.patch"; - url = "https://github.com/mgieseki/dvisvgm/commit/f31cdf14d73f586e2b92b4b0891d097a90274a0b.patch"; - hash = "sha256-Yf/GhmJYM87M0ITZ/+7q2ZvSYnac4N2/NkTkFlJ2VII="; - stripLen = 1; - extraPrefix = "texk/dvisvgm/dvisvgm-src/"; - }) + configureFlags = [ + "--disable-manpage" # man pages are provided by the doc container ]; - # since we are running configure directly in texk/dvisvgm, - # the option --with-system-potrace is not picked up properly - # and dvisvgm tries to build a vendored copy of potrace + # PDF handling requires mutool (from mupdf) since Ghostscript 10.01 postPatch = '' - cat > texk/dvisvgm/dvisvgm-src/libs/potrace/Makefile <<EOF - all: - install: - EOF - '' + - # PDF handling requires mutool (from mupdf) since Ghostscript 10.01 - '' - substituteInPlace texk/dvisvgm/dvisvgm-src/src/PDFHandler.cpp \ - --replace 'Process("mutool"' "Process(\"$(PATH="$HOST_PATH" command -v mutool)\"" + substituteInPlace src/PDFHandler.cpp \ + --replace-fail 'Process("mutool"' "Process(\"$(PATH="$HOST_PATH" command -v mutool)\"" ''; - preConfigure = "cd texk/dvisvgm"; - - configureFlags = common.configureFlags - ++ [ "--with-system-kpathsea" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf-headless ]; |