diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index bea288e29586..813db0984751 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -3,22 +3,20 @@ , boost , cairo , cmake -, double-conversion , fetchurl -, fetchpatch , gettext -, gdl , ghostscript , glib , glib-networking , glibmm , gsl +, gspell , gtk-mac-integration , gtkmm3 -, gtkspell3 , gdk-pixbuf , imagemagick , lcms +, lib2geom , libcdr , libexif , libpng @@ -47,16 +45,17 @@ let (ps: with ps; [ numpy lxml + pillow scour ]); in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0.2"; + version = "1.1"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo="; + sha256 = "sha256-cebozj/fcC9Z28SidmZeuYLreCKwKbvb7O0t9DAXleY="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -72,13 +71,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with glib 2.68 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/2790 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch"; - sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI="; - }) ]; postPatch = '' @@ -91,6 +83,10 @@ stdenv.mkDerivation rec { --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'" patchShebangs share/templates patchShebangs man/fix-roff-punct + + # double-conversion is a dependency of 2geom + substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \ + --replace 'find_package(DoubleConversion REQUIRED)' "" ''; nativeBuildInputs = [ @@ -109,8 +105,6 @@ stdenv.mkDerivation rec { buildInputs = [ boehmgc boost - double-conversion - gdl gettext glib glib-networking @@ -119,6 +113,7 @@ stdenv.mkDerivation rec { gtkmm3 imagemagick lcms + lib2geom libcdr libexif libpng @@ -138,7 +133,7 @@ stdenv.mkDerivation rec { python3Env zlib ] ++ lib.optionals (!stdenv.isDarwin) [ - gtkspell3 + gspell ] ++ lib.optionals stdenv.isDarwin [ cairo gtk-mac-integration diff --git a/pkgs/applications/graphics/inkscape/fix-python-paths.patch b/pkgs/applications/graphics/inkscape/fix-python-paths.patch index 9428ade88630..9634be50497f 100644 --- a/pkgs/applications/graphics/inkscape/fix-python-paths.patch +++ b/pkgs/applications/graphics/inkscape/fix-python-paths.patch @@ -1,15 +1,17 @@ +diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp +index bc6c0ed845..181467834d 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp -@@ -77,10 +77,10 @@ const std::map Script::interpreterTab = { + { "python", {"python-interpreter", {"pythonw" }}}, #elif defined __APPLE__ - { "perl", {"perl-interpreter", {"perl" }}}, -- { "python", {"python-interpreter", {"python3" }}}, -+ { "python", {"python-interpreter", {"@python3@" }}}, + { "perl", {"perl-interpreter", {"perl" }}}, +- { "python", {"python-interpreter", {"python3" }}}, ++ { "python", {"python-interpreter", {"@python3@" }}}, #else - { "perl", {"perl-interpreter", {"perl" }}}, -- { "python", {"python-interpreter", {"python3", "python" }}}, -+ { "python", {"python-interpreter", {"@python3@" }}}, + { "perl", {"perl-interpreter", {"perl" }}}, +- { "python", {"python-interpreter", {"python3", "python" }}}, ++ { "python", {"python-interpreter", {"@python3@" }}}, #endif - { "python2", {"python2-interpreter", {"python2", "python" }}}, - { "ruby", {"ruby-interpreter", {"ruby" }}}, + { "python2", {"python2-interpreter", {"python2", "python" }}}, + { "ruby", {"ruby-interpreter", {"ruby" }}}, diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index daa088997309..58b462194bbf 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -30,6 +30,8 @@ let version = "3.1"; pname = "weechat"; + hardeningEnable = [ "pie" ]; + src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; sha256 = "06w147wzrzp6xbqiz6s5nq5xdjy7jn3f18xajxy50pynjd6vmfh5"; @@ -68,6 +70,11 @@ let done ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/weechat --version + ''; + meta = { homepage = "http://www.weechat.org/"; description = "A fast, light and extensible chat client"; diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix new file mode 100644 index 000000000000..8e3b9f136745 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, writeShellScriptBin, skawarePackages +}: + +let + version = "1.2.0"; + sha256 = "1z9fmrfxqi56pj7f1506q2z41crz702jk88gv57baf6fz63m93v2"; + +in stdenv.mkDerivation { + pname = "git-vendor"; + inherit version; + + src = fetchFromGitHub { + owner = "brettlangdon"; + repo = "git-vendor"; + rev = "v${version}"; + inherit sha256; + }; + + outputs = [ "bin" "man" "doc" "out" ]; + + PREFIX = (placeholder "out"); + BINPREFIX = "${placeholder "bin"}/bin"; + MANPREFIX = "${placeholder "man"}/share/man/man1"; + + buildInputs = [ + # stubbing out a `git config` check that `make install` tries to do + (writeShellScriptBin "git" "") + ]; + + postInstall = '' + ${skawarePackages.cleanPackaging.commonFileActions { + docFiles = [ + "LICENSE" + "README.md" + ]; + noiseFiles = [ + "bin/git-vendor" + "Makefile" + "etc/bash_completion.sh" + "man" + "install.sh" + ]; + }} $doc/share/doc/git-vendor + ''; + + postFixup = '' + ${skawarePackages.cleanPackaging.checkForRemainingFiles} + ''; + + meta = { + description = "A git command for managing vendored dependencies"; + longDescription = '' + git-vendor is a wrapper around git-subtree commands for checking out and updating vendored dependencies. + + By default git-vendor conforms to the pattern used for vendoring golang dependencies: + * Dependencies are stored under vendor/ directory in the repo. + * Dependencies are stored under the fully qualified project path. + e.g. https://github.com/brettlangdon/forge will be stored under vendor/github.com/brettlangdon/forge. + ''; + homepage = "https://github.com/brettlangdon/git-vendor"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = lib.platforms.all; + }; + +} diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix new file mode 100644 index 000000000000..755ed6b814e6 --- /dev/null +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitLab +, cmake +, ninja +, pkg-config +, boost +, glib +, gsl +, cairo +, double-conversion +, gtest +, lib +}: + +stdenv.mkDerivation rec { + pname = "lib2geom"; + version = "1.1"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitLab { + owner = "inkscape"; + repo = "lib2geom"; + rev = "refs/tags/${version}"; + sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + boost + glib + gsl + cairo + double-conversion + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + "-D2GEOM_BUILD_SHARED=ON" + ]; + + doCheck = true; + + meta = with lib; { + description = "Easy to use 2D geometry library in C++"; + homepage = "https://gitlab.com/inkscape/lib2geom"; + license = [ licenses.lgpl21Only licenses.mpl11 ]; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index cf869b6e5ef9..aac8b27955b5 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl , lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr , pgocaml, camlzip, ocaml_sqlite3 -, makeWrapper, fetchpatch +, makeWrapper }: if !lib.versionAtLeast ocaml.version "4.06.1" @@ -13,22 +13,16 @@ let mkpath = p: n: in stdenv.mkDerivation rec { - version = "2.16.0"; + version = "2.18.0"; pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; rev = version; - sha256 = "0dd7zfk8dlajv0297dswaaqh96hjk2ppy8zb67jbkd26nimahk9y"; + sha256 = "0c61wkq8ddy3qxb2x1jz04rz0722hk92r6jl1zvgikh74m5p5ipp"; }; - # unreleased fix for Makefile typos breaking compilation - patches = [ (fetchpatch { - url = "https://github.com/ocsigen/ocsigenserver/commit/014aefc4e460686a361b974f16ebb7e0c993b36b.patch"; - sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7"; - }) ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 7364920cba22..12ef896117ab 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver +{ lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo +, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend -, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11 +, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter , enableQt ? false, pyqt5 +# required for headless detection +, libX11, wayland , Cocoa -, pythonOlder }: +let + interactive = enableTk || enableGtk3 || enableQt; +in + buildPythonPackage rec { version = "3.4.1"; pname = "matplotlib"; @@ -62,8 +67,14 @@ buildPythonPackage rec { let tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - lib.optionalString enableTk - "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; + lib.optionalString enableTk '' + sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py + '' + lib.optionalString (stdenv.isLinux && interactive) '' + # fix paths to libraries in dlopen calls (headless detection) + substituteInPlace src/_c_internal_utils.c \ + --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ + --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 + ''; # Matplotlib needs to be built against a specific version of freetype in # order for all of the tests to pass. @@ -72,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; + license = with licenses; [ psfl bsd0 ]; maintainers = with maintainers; [ lovek323 veprbl ]; }; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index aa2182c176d3..1066b95fd6f0 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.9.0"; + version = "0.10.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gurumitts"; repo = pname; rev = "v${version}"; - sha256 = "07mz4hn0455qmfqs4xcqlhbf3qvrnmifd0vzpcqlqaqcn009iahq"; + sha256 = "sha256-wKnca9sMdjvxxAW5YwLZFK/skmE6QMZG99HZRR3BIzw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index fe4cd4ea48dd..d2c32fc138af 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 00cd19863d66..69059578e273 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2.4"; + version = "2021.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-yFZ01bfejbq8zQ52DbcomBcHnB6H5Ds4MJP93xQ2/jU="; + sha256 = "sha256-QhTjzrERhbhCSkPzyLQwFyxrktNoGL9ris+XfE7n5nQ="; }; - vendorSha256 = "sha256-Uw36Jn9RGcVIyzDOMIwi6hMQsSDWKG0kYpOOpREANyA="; + vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY="; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index fd63d7a0cc7a..f93a15f6b4c2 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.9"; + version = "2.3.0"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1dz3800jrq41l833q5ihi511wj5fiyw329g7hbxsbc9whkx7hngn"; + sha256 = "1wdm4wwwv7n73fi330szcnyf25zhvj6dgy839aawh84ik118yg2v"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 623bc8c42f87..88f1b1ebad0a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "022f56rhvzq5f6clihxg5c8kyvjp1byjipha1ni6yiqzh3wvqccq"; + sha256 = "0zrb9r9yh05nip2gwg96fhfk766hwqwa8plcvj2b4x4hhjk6q1ps"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index fdb2f7395c83..e4196b61290c 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "smlar-unstable"; - version = "2020-04-08"; + version = "2020-10-07"; src = fetchgit { url = "git://sigaev.ru/smlar.git"; - rev = "0c345af71969d9863bb76efa833391d00705669e"; - sha256 = "1pr3pbnjc9n209l52sgsn4xqzp92qk6wci55hcqjjrwf2gdxy0yr"; + rev = "25a4fef344f5c2b90e6a9d32144ee12b9198487d"; + sha256 = "14mj63mbkcphrzw6890pb5n8igh27i9g7kh4wjdhgx3g7llbjbdw"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index a42499eebce7..3af444a2e52c 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -136,9 +136,7 @@ in rec { local libs=$(${stdenv.cc.targetPrefix}otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true local newlib for lib in $libs; do - newlib=''${lib:${toString (storePrefixLen + 1)}} - newlib=''${newlib#*/} - ${stdenv.cc.targetPrefix}install_name_tool -change $lib "@rpath/$newlib" "$1" + ${stdenv.cc.targetPrefix}install_name_tool -change $lib "@rpath/$(basename "$lib")" "$1" done } @@ -160,7 +158,7 @@ in rec { for i in $out/bin/*; do if test -x "$i" -a ! -L "$i" -a "$(basename $i)" != codesign; then echo "Adding @executable_path to rpath in $i" - ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/..' $i + ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i fi done diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index da24627d7c45..f79b15a9890a 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.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-Cm/w0bwDMu5REsQpkwMBgnROxpI+nMQwC16dY/VdOFU="; + sha256 = "034csv43vc0q2ycwjfskv1zx08c40ykf1m22fh9wvms0860k2ysn"; }; - cargoSha256 = "sha256-oj6ZuhdKSj6OFSICG977qEY9QWP40FEXwiHXpirsILI="; + cargoSha256 = "0jgwf30gqwwpaf2g5zbsglcmsa00vixrnlizvcd41afi1wkjgiyd"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 7ac242c88f80..4558b88a2d47 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "0.8.1"; + version = "0.8.21"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "04ya8sa0qhj0g3h5fi5fmx0xg1glg993xad4glfm317spgkff6z7"; + sha256 = "sha256-cwQCqKC/onEZ4i533NSHrnNAl8/sRivK/ItX8oqB86Q="; }; - cargoSha256 = "1gch2742zv0f23mq8ppmi75lmjj5m3s14wlsr72nd8hyn3ff7kbw"; + cargoSha256 = "sha256-W29k2eLcYTqVn0v1dJrvFLRcWuVMsoHD+vPDL7YkiWE="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/tools/networking/crackle/default.nix new file mode 100644 index 000000000000..00d0acd2aa94 --- /dev/null +++ b/pkgs/tools/networking/crackle/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, libpcap, coreutils }: + +stdenv.mkDerivation { + pname = "crackle"; + version = "unstable-2020-12-13"; + + src = fetchFromGitHub { + owner = "mikeryan"; + repo = "crackle"; + rev = "d83b4b6f4145ca53c46c36bbd7ccad751af76b75"; + sha256 = "sha256-Dy4s/hr9ySrogltyk2GVsuAvwNF5+b6CDjaD+2FaPHA="; + }; + + buildInputs = [ libpcap ]; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" "INSTALL=${coreutils}/bin/install" ]; + + meta = with lib; { + description = "Crack and decrypt BLE encryption"; + homepage = "https://github.com/mikeryan/crackle"; + maintainers = with maintainers; [ fortuneteller2k ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/tools/networking/mdk4/default.nix new file mode 100644 index 000000000000..903504633ac8 --- /dev/null +++ b/pkgs/tools/networking/mdk4/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, libnl, libpcap, pkg-config }: + +stdenv.mkDerivation { + pname = "mdk4"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "aircrack-ng"; + repo = "mdk4"; + rev = "e94422ce8e4b8dcd132d658345814df7e63bfa41"; + sha256 = "sha256-pZS7HQBKlSZJGqoZlSyBUzXC3osswcB56cBzgm+Sbwg="; + }; + + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/share/man + + substituteInPlace src/Makefile --replace '/usr/local/src/mdk4' '$out' + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnl libpcap ]; + + makeFlags = [ "PREFIX=$(out)" "SBINDIR=$(PREFIX)/bin" ]; + + meta = with lib; { + description = "A tool that injects data into wireless networks"; + homepage = "https://github.com/aircrack-ng/mdk4"; + maintainers = with maintainers; [ fortuneteller2k ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 7323d092472f..9d7221cf5d5f 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E1tJ9hEJ4GaL+S4dz6aGq3nJPpdtx0/Tfb1RzgJSe8M="; + sha256 = "sha256-NcLXpxPtTwc/ThI/A9wQ9XI2Msxviy1Ipz8TSfcrHbI="; }; - vendorSha256 = "sha256-LUyrX/rm01tCPT6Ua6hphhf+4ycNn4tLONRyH3iTrZ4="; + vendorSha256 = "sha256-9uKtrKcF950ZEvpxJzmIQMwc/f1IlgHF8du+RIxhtKI="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index def3a953a045..851cdbe0a1a4 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-zwQDPOpctnAj6J6mQ4N7O1KJiAIu6osB/IlnM0D/hZA="; + sha256 = "sha256-UrukkBY4kxAh9V4V1VoHMfBGx9rH6A+kZI0BtkT0ito="; }; - vendorSha256 = "sha256-Cb7RomQ/+O9xgUlCudoj7zLd2vrs58d00/vk/EboJ6Q="; + vendorSha256 = "sha256-yk94jD8gwgmEroxg7vzfaISVakMv3+tUoq+Auas751w="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6822f943001e..aee4c05fc0dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -269,6 +269,8 @@ in cpu-x = callPackage ../applications/misc/cpu-x { }; + crackle = callPackage ../tools/networking/crackle { }; + crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -5078,6 +5080,8 @@ in git-vanity-hash = callPackage ../applications/version-management/git-and-tools/git-vanity-hash { }; + git-vendor = callPackage ../applications/version-management/git-and-tools/git-vendor { }; + git-when-merged = callPackage ../applications/version-management/git-and-tools/git-when-merged { }; git-workspace = callPackage ../applications/version-management/git-and-tools/git-workspace { @@ -6757,6 +6761,8 @@ in mdk = callPackage ../development/tools/mdk { }; + mdk4 = callPackage ../tools/networking/mdk4 { }; + mdp = callPackage ../applications/misc/mdp { }; mednafen = callPackage ../misc/emulators/mednafen { }; @@ -15631,6 +15637,8 @@ in leptonica = callPackage ../development/libraries/leptonica { }; + lib2geom = callPackage ../development/libraries/lib2geom { }; + lib3ds = callPackage ../development/libraries/lib3ds { }; lib3mf = callPackage ../development/libraries/lib3mf { };