diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/okta-aws-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/default.nix | 38 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/nrfconnect/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/graphics/structure-synth/default.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/graphics/structure-synth/gcc47.patch | 50 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/hime/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus/ibus-qt.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/uim/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/misc/qjoypad/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/veilid/Cargo.lock | 279 | ||||
-rw-r--r-- | pkgs/tools/networking/veilid/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/security/omapd/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/security/omapd/zlib.patch | 9 | ||||
-rw-r--r-- | pkgs/tools/security/vault-ssh-plus/default.nix | 6 |
14 files changed, 122 insertions, 445 deletions
diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 38a2d42ac0a..52a3422bfa8 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "1.1.0"; + version = "1.2.1"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-TRS1+msrp+Wd+9FhQSErZGvfpcRA5ltNKIyVHLveMOo="; + sha256 = "1d148zf9warwg8kvkqpw79dwmlrab61hpird58wlh6jyqfxa5729"; }; vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8="; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix deleted file mode 100644 index 21dc009e33d..00000000000 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }: - -stdenv.mkDerivation rec { - pname = "acoustid-fingerprinter"; - version = "0.6"; - - src = fetchurl { - url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" - + "${pname}-${version}.tar.gz"; - sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ]; - - cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; - - patches = [ - (fetchpatch { - name = "fix-build-with-libav-10.patch"; - url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/2c778334a9fc2f0ccf9b1d7635c116bce6509748/raw"; - sha256 = "1smyp3x5n6jwxpgw60xsijq2fn6g1gl759h1lm5agaxhcyyqn0i0"; - }) - (fetchpatch { - name = "fix-build-failure-on-gcc-6.patch"; - url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; - sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; - }) - ]; - - meta = with lib; { - homepage = "https://acoustid.org/fingerprinter"; - description = "Audio fingerprinting tool using chromaprint"; - license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ ehmry ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/tools/bluetooth/nrfconnect/default.nix deleted file mode 100644 index 07dc7303a06..00000000000 --- a/pkgs/tools/bluetooth/nrfconnect/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchurl -, appimageTools -}: - -let - pname = "nrfconnect"; - version = "4.0.1"; - - src = fetchurl { - url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage"; - sha256 = "sha256-Mh4DrXn3DS5qOz3109lmXyFn28WenG6ZSvqFnUuc+rw="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = pkgs: with pkgs; [ - segger-jlink - ]; - - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/nrfconnect.desktop $out/share/applications/nrfconnect.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \ - $out/share/icons/hicolor/512x512/apps/nrfconnect.png - substituteInPlace $out/share/applications/nrfconnect.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Nordic Semiconductor nRF Connect for Desktop"; - homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix deleted file mode 100644 index e61489fadf0..00000000000 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "structure-synth"; - version = "1.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip"; - sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; - }; - - buildInputs = [ qt4 libGLU ]; - nativeBuildInputs = [ qmake4Hook makeWrapper unzip ]; - - # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: - patches = [ ./gcc47.patch ]; - - enableParallelBuilding = true; - - preConfigure = '' - ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" - ''; - - installPhase = '' - mkdir -p $out/bin; - mkdir -p $out/share/Examples $out/share/Misc; - cp "Structure Synth Source Code" $out/bin/structure-synth; - cp -r Examples/* $out/share/Examples; - cp -r Misc/* $out/share/Misc; - ''; - - # Structure Synth expects to see 'Examples' and 'Misc' directory in - # either $HOME or $PWD - so help it along by moving $PWD to 'share', - # where we just copied those two directories: - preFixup = '' - wrapProgram "$out/bin/structure-synth" --chdir "$out/share" - ''; - - meta = with lib; { - description = "Application for generating 3D structures by specifying a design grammar"; - homepage = "https://structuresynth.sourceforge.net"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch deleted file mode 100644 index 8726e89c830..00000000000 --- a/pkgs/tools/graphics/structure-synth/gcc47.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400 -*************** -*** 1,5 **** - #include <QThread> -! - - #include "RayTracer.h" - ---- 1,5 ---- - #include <QThread> -! #include <GL/glu.h> - - #include "RayTracer.h" - -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400 -*************** -*** 122,128 **** - currentT = p; - - // We do not intersect grid. -! if (!found) return false; - } - - stepX = (dir.x() > 0) ? 1 : -1; ---- 122,128 ---- - currentT = p; - - // We do not intersect grid. -! if (!found) return NULL; - } - - stepX = (dir.x() > 0) ? 1 : -1; -Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400 -*************** -*** 2,7 **** ---- 2,8 ---- - - #include "SyntopiaCore/Math/Vector3.h" - #include "Object3D.h" -+ #include <GL/glu.h> - - namespace SyntopiaCore { - namespace GLEngine { diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 4c86fb04cf0..685ac169e06 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -4,7 +4,6 @@ , which , gtk2 , gtk3 -, qt4 , qt5 , libXtst , lib @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which pkg-config unixtools.whereis ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ]; + buildInputs = [ libXtst gtk2 gtk3 qt5.qtbase libchewing anthy ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix deleted file mode 100644 index c119b1d3559..00000000000 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }: - -stdenv.mkDerivation rec { - pname = "ibus-qt"; - version = "1.3.4"; - - src = fetchurl { - url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz"; - sha256 = "sha256-HnsMy4i8NscCVFF28IcOZ2BoXozZfZzXk4CE9c7bL/E="; - }; - - nativeBuildInputs = [ cmake pkg-config doxygen ]; - buildInputs = [ ibus qt4 icu ]; - - cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; - - meta = with lib; { - homepage = "https://github.com/ibus/ibus-qt/"; - description = "Qt4 interface to the ibus input method"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ gebner ]; - }; -} diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 4e52e605686..70d3e8e8725 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -7,8 +7,7 @@ , withGtk2 ? withGtk, gtk2 ? null , withGtk3 ? withGtk, gtk3 ? null , withQt ? true -, withQt4 ? withQt, qt4 ? null -, withQt5 ? false, qt5 ? null +, withQt5 ? withQt, qt5 ? null , withLibnotify ? true, libnotify ? null , withSqlite ? true, sqlite ? null , withNetworking ? true, curl ? null, openssl ? null @@ -21,13 +20,6 @@ assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; -# TODO(@oxij): ./configure can't find both qmakes at the same time -# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation -assert withQt4 -> !withQt5 && qt4 != null; -assert withQt5 -> !withQt4 && qt5 != null; - -assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory" - assert withAnthy -> anthy != null; assert withLibnotify -> libnotify != null; assert withSqlite -> sqlite != null; @@ -60,7 +52,6 @@ stdenv.mkDerivation rec { ++ lib.optional withAnthy anthy ++ lib.optional withGtk2 gtk2 ++ lib.optional withGtk3 gtk3 - ++ lib.optional withQt4 qt4 ++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] ++ lib.optional withLibnotify libnotify ++ lib.optional withSqlite sqlite @@ -114,10 +105,6 @@ stdenv.mkDerivation rec { ++ lib.optional withAnthy "--with-anthy-utf8" ++ lib.optional withGtk2 "--with-gtk2" ++ lib.optional withGtk3 "--with-gtk3" - ++ lib.optionals withQt4 [ - "--with-qt4" - "--with-qt4-immodule" - ] ++ lib.optionals withQt5 [ "--with-qt5" "--with-qt5-immodule" diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 018086e6dc7..6770ec133d3 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -10,8 +10,8 @@ mkDerivation rec { hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y"; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libX11 libXtst qtbase qttools qtx11extras ]; + nativeBuildInputs = [ pkg-config cmake qttools ]; + buildInputs = [ libX11 libXtst qtbase qtx11extras ]; meta = with lib; { description = "A program that lets you use gaming devices anywhere"; diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index 75cc901e1fd..2585bef885c 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -430,7 +430,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -461,7 +461,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -730,7 +730,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -798,14 +798,6 @@ dependencies = [ ] [[package]] -name = "bugsalot" -version = "0.2.2" -source = "git+https://github.com/crioux/bugsalot.git#336a7053faadf990b9362edf5752ef34fa1f9615" -dependencies = [ - "libc", -] - -[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1012,7 +1004,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1164,32 +1156,16 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" @@ -1201,7 +1177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", + "core-foundation", "core-graphics-types", "foreign-types", "libc", @@ -1214,7 +1190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", + "core-foundation", "libc", ] @@ -1303,17 +1279,18 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.4", + "nix 0.27.1", "windows-sys 0.48.0", ] [[package]] name = "cursive" version = "0.20.0" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "ahash 0.8.3", "async-std", @@ -1333,9 +1310,9 @@ dependencies = [ [[package]] name = "cursive-flexi-logger-view" version = "0.5.0" +source = "git+https://gitlab.com/veilid/cursive-flexi-logger-view.git#7c931536b8c57339011bbe2ee604e431c91c0aa8" dependencies = [ "arraydeque", - "cursive", "cursive_core", "flexi_logger", "lazy_static", @@ -1347,6 +1324,7 @@ dependencies = [ [[package]] name = "cursive-macros" version = "0.1.0" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "proc-macro2", "quote", @@ -1355,7 +1333,8 @@ dependencies = [ [[package]] name = "cursive_buffered_backend" -version = "0.6.1-pre" +version = "0.6.1" +source = "git+https://gitlab.com/veilid/cursive-buffered-backend.git#a0f5242882b0d42a0b18baa68b2d8d6dcaa6dee4" dependencies = [ "cursive_core", "enumset", @@ -1368,6 +1347,7 @@ dependencies = [ [[package]] name = "cursive_core" version = "0.3.7" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "ahash 0.8.3", "ansi-parser", @@ -1424,7 +1404,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1480,7 +1460,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1502,7 +1482,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1684,7 +1664,7 @@ checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1727,7 +1707,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1807,28 +1787,6 @@ dependencies = [ ] [[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2043,7 +2001,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2266,15 +2224,6 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.3", -] - -[[package]] -name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" @@ -2285,14 +2234,6 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.2" -dependencies = [ - "hashbrown 0.13.2", - "serde", -] - -[[package]] -name = "hashlink" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" @@ -2466,7 +2407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -2520,17 +2461,6 @@ dependencies = [ ] [[package]] -name = "igd" -version = "0.12.1" -dependencies = [ - "attohttpc", - "log", - "rand 0.8.5", - "url", - "xmltree", -] - -[[package]] name = "image" version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2602,9 +2532,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -2706,28 +2633,18 @@ dependencies = [ ] [[package]] -name = "keychain-services" -version = "0.1.2" -source = "git+https://github.com/iqlusioninc/keychain-services.rs.git?rev=7410fb8baf4ecdf04cdcd7d06d02658f4f158d77#7410fb8baf4ecdf04cdcd7d06d02658f4f158d77" -dependencies = [ - "core-foundation 0.7.0", - "failure", - "failure_derive", - "zeroize", -] - -[[package]] name = "keyring-manager" version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c023f807de9a2f26e86c6ec3b5a3e0ea5681301999dcda9e262069ab3efb63e" dependencies = [ "byteorder", "cfg-if 1.0.0", - "core-foundation 0.9.3", - "core-foundation-sys 0.8.4", + "core-foundation", + "core-foundation-sys", "directories 5.0.1", "fs4", "jni", - "keychain-services", "lazy_static", "log", "ndk", @@ -2744,6 +2661,8 @@ dependencies = [ [[package]] name = "keyvaluedb" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8833bc9e937f44bac0e8d129b3ccda60dee6ca5fa2757d7e05a5e04503df02fb" dependencies = [ "smallvec", ] @@ -2751,6 +2670,8 @@ dependencies = [ [[package]] name = "keyvaluedb-memorydb" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14fdc324ae658318df46f62e64159c5662b94bcc99f9b6403d47d20ca7768b21" dependencies = [ "keyvaluedb", "parking_lot 0.12.1", @@ -2759,6 +2680,8 @@ dependencies = [ [[package]] name = "keyvaluedb-sqlite" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6bad95a1ad34c10ad4823fae1cb655be7fec022de642c95fbfafad360ba2f54" dependencies = [ "hex", "keyvaluedb", @@ -2770,6 +2693,8 @@ dependencies = [ [[package]] name = "keyvaluedb-web" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26cc6bb420f98cdd63a72c95eaa06947cdbd04e60a8d296b87f466196bacf068" dependencies = [ "async-lock", "flume", @@ -2778,7 +2703,7 @@ dependencies = [ "keyvaluedb", "keyvaluedb-memorydb", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "send_wrapper 0.6.0", "wasm-bindgen", "web-sys", @@ -2934,9 +2859,9 @@ checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -3400,9 +3325,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3695,7 +3620,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -3766,7 +3691,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -4082,13 +4007,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "regex-syntax 0.7.5", ] @@ -4103,9 +4028,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -4200,7 +4125,7 @@ dependencies = [ "bitflags 2.4.0", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.8.4", + "hashlink", "libsqlite3-sys", "smallvec", ] @@ -4378,8 +4303,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.3", - "core-foundation-sys 0.8.4", + "core-foundation", + "core-foundation-sys", "libc", "security-framework-sys", ] @@ -4390,7 +4315,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", ] @@ -4451,7 +4376,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -4484,7 +4409,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -4556,7 +4481,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -4833,9 +4758,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -4849,25 +4774,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] name = "sysinfo" version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", "ntapi", "once_cell", @@ -4917,22 +4830,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -5050,7 +4963,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -5259,7 +5172,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -5518,12 +5431,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5599,13 +5506,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] +name = "veilid-bugsalot" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" + +[[package]] name = "veilid-cli" -version = "0.2.0" +version = "0.2.1" dependencies = [ "arboard", "async-std", "async-tungstenite 0.8.0", - "bugsalot", "cfg-if 1.0.0", "clap 4.4.2", "config", @@ -5631,12 +5543,13 @@ dependencies = [ "thiserror", "tokio", "tokio-util", + "veilid-bugsalot", "veilid-tools", ] [[package]] name = "veilid-core" -version = "0.2.0" +version = "0.2.1" dependencies = [ "argon2", "async-io", @@ -5648,7 +5561,6 @@ dependencies = [ "async_executors", "backtrace", "blake3", - "bugsalot", "capnp", "capnpc", "cfg-if 1.0.0", @@ -5668,10 +5580,8 @@ dependencies = [ "futures-util", "generic-array 0.14.7", "getrandom 0.2.10", - "hashlink 0.8.2", "hex", "ifstructs", - "igd", "jni", "jni-sys", "js-sys", @@ -5721,6 +5631,9 @@ dependencies = [ "tracing-subscriber", "tracing-wasm", "trust-dns-resolver", + "veilid-bugsalot", + "veilid-hashlink", + "veilid-igd", "veilid-tools", "wasm-bindgen", "wasm-bindgen-futures", @@ -5740,7 +5653,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.0" +version = "0.2.1" dependencies = [ "allo-isolate", "async-std", @@ -5768,14 +5681,36 @@ dependencies = [ ] [[package]] +name = "veilid-hashlink" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3dabbda02cfe176635dcaa18a021416ff2eb4d0b47a913e3fdc7f62049d7b1" +dependencies = [ + "hashbrown 0.14.0", + "serde", +] + +[[package]] +name = "veilid-igd" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28428a3f826ed334f995522e554d7c8c1a5a0e0a0248fc795a31022ddf436c9d" +dependencies = [ + "attohttpc", + "log", + "rand 0.8.5", + "url", + "xmltree", +] + +[[package]] name = "veilid-server" -version = "0.2.0" +version = "0.2.1" dependencies = [ "ansi_term", "async-std", "async-tungstenite 0.23.0", "backtrace", - "bugsalot", "cfg-if 1.0.0", "clap 4.4.2", "color-eyre", @@ -5812,6 +5747,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "url", + "veilid-bugsalot", "veilid-core", "wg", "windows-service", @@ -5819,7 +5755,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.0" +version = "0.2.1" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5833,6 +5769,7 @@ dependencies = [ "flume", "fn_name", "futures-util", + "getrandom 0.2.10", "jni", "jni-sys", "js-sys", @@ -5870,7 +5807,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.0" +version = "0.2.1" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -5970,7 +5907,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-shared", ] @@ -6004,7 +5941,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6518,7 +6455,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index 6e1531cd6e2..7a859c7283f 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,21 +10,21 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-OgV6Rp5Az5iPUekeO8L28bxlXj/wZ5mOGmlXz14wcoQ="; + sha256 = "sha256-ebWY/1LTLwi1YFHliPDracdF0WLfY047jUtQ/1w9Rjw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "bugsalot-0.2.2" = "sha256-9zLzK22dOB7w+ejk1SfkA98z4rEzrB6mAVUpPFuDUnY="; - "keychain-services-0.1.2" = "sha256-gkiE9PoSIgHngXc/BLMTL97/6dSnqAj42+q01CLbu+E="; + "cursive-0.20.0" = "sha256-jETyRRnzt7OMkTo4LRfeRr37oPJpn9R2soxkH7tzGy8="; + "cursive-flexi-logger-view-0.5.0" = "sha256-zFpfVFNZNNdNMdpJbaT4O2pMYccGEAGnvYzpRziMwfQ="; + "cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8="; }; }; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix deleted file mode 100644 index c2d911372eb..00000000000 --- a/pkgs/tools/security/omapd/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, gdb, zlib }: - -stdenv.mkDerivation rec { - pname = "omapd"; - version = "0.9.2"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz"; - sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc"; - }; - - patches = [ ./zlib.patch ]; - - buildInputs = [ qt4 zlib gdb ]; - - buildPhase = '' - (cd plugins/RAMHashTables; qmake; make) - qmake - make - ''; - - installPhase = '' - install -vD omapd $out/bin/omapd - install -vD omapd.conf $out/etc/omapd.conf - install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so - ln -s $out/usr/lib/omapd/plugins $out/bin/plugins - ''; - - meta = with lib; { - homepage = "https://code.google.com/archive/p/omapd/"; - description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/tools/security/omapd/zlib.patch deleted file mode 100644 index dc0644f2a01..00000000000 --- a/pkgs/tools/security/omapd/zlib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro ---- omapd-0.9.2-old/omapd.pro 2015-08-03 09:46:47.463420480 +0200 -+++ omapd-0.9.2/omapd.pro 2015-08-03 09:48:32.238657105 +0200 -@@ -37,4 +37,4 @@ - clientconfiguration.h \ - managementserver.h \ - json.h --INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib -+LIBS += -lz diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix index 384571bde26..4979f914143 100644 --- a/pkgs/tools/security/vault-ssh-plus/default.nix +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-D38G947/1//AMmWghgw0TDzNcd4LUcCuyLBhRP7YFJY="; + hash = "sha256-J2fb1sRjBxLegFVwyEIRVolaLnXvziPrlidd/n/+tU8="; }; - vendorHash = "sha256-tNdr2xyxri7mj1bP6oVx1DGzwrzg84TpPCY0kHNkXLw="; + vendorHash = "sha256-Casouw2fNg/hywx7A37VCVzQ8Gfnvf5qm6upOTUQZvA="; nativeBuildInputs = [ makeWrapper ]; |