mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge staging-next into staging
This commit is contained in:
commit
a52ec8eede
@ -28,7 +28,7 @@ let
|
||||
You still need to set the <literal>image</literal> attribute, as it
|
||||
will be used as the image name for docker to start a container.
|
||||
'';
|
||||
example = literalExpression "pkgs.dockerTools.buildDockerImage {...};";
|
||||
example = literalExpression "pkgs.dockerTools.buildImage {...};";
|
||||
};
|
||||
|
||||
login = {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lndmanage";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitromortac";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vnv03k2d11rw6mry6fmspiy3hqsza8y3daxnn4lp038gw1y0f4z";
|
||||
hash = "sha256-wPr/R+WGACyhv2Qh9JeLJwvr2vQfxpqj2XjEkrRoSX4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
@ -15,20 +15,19 @@
|
||||
, alsa-lib
|
||||
, speex
|
||||
, ilbc
|
||||
, fetchurl
|
||||
, mkDerivation
|
||||
, bcg729
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "twinkle";
|
||||
version = "1.10.2";
|
||||
version = "unstable-2021-02-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "LubosD";
|
||||
rev = "v${version}";
|
||||
sha256 = "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx";
|
||||
repo = "twinkle";
|
||||
rev = "2301b66a3f54b266675415d261985488d86e9e4c";
|
||||
sha256 = "xSwcaj1Hm62iL7C/AxqjVR07VEae8gDgYdr2EWmCoOM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -46,19 +45,6 @@ mkDerivation rec {
|
||||
ilbc
|
||||
];
|
||||
|
||||
patches = [
|
||||
# patch for bcg729 1.0.2+
|
||||
(fetchurl { # https://github.com/LubosD/twinkle/pull/152
|
||||
url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch";
|
||||
sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2";
|
||||
})
|
||||
# patch manual link to not link to old url, which now points to NSFW page
|
||||
(fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07
|
||||
url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff";
|
||||
sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
bison
|
||||
|
@ -13,13 +13,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "beamerpresenter";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stiglers-eponym";
|
||||
repo = "BeamerPresenter";
|
||||
rev = "v${version}";
|
||||
sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a";
|
||||
sha256 = "sha256-+ZxllYL2wco4bG2pqInIbL9qfOoqoUJJUReqDyEBRcI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "glitter";
|
||||
version = "1.5.7";
|
||||
version = "1.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milo123459";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0hKwGZingOa4nB9VTErbOTSBLc4pcxDUnK5lltVZiYk=";
|
||||
sha256 = "sha256-jznlGPRYzWND5qdopD4iMz1IgduP8hXV4T+IGkSI3Qg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-08heeRIGzPmORh8KTyBx9GPfOZw2RR85PjkGvbaGA50=";
|
||||
cargoSha256 = "sha256-HAEyb2iVGRxaHQhy3zUgmRiBtXHmyxgmmh1R8wwoBs0=";
|
||||
|
||||
# tests require it to be in a git repository
|
||||
preCheck = ''
|
||||
|
@ -12,20 +12,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20211113";
|
||||
version = "20211202";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-A9aiaS4CXRpr4+Y8+tyvWYRbR9STFS9TuplGksPfqtU=";
|
||||
hash = "sha256-aq4hnr581dNYoULeqdB9gWetDcuOthPNJuzHFVGNFc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib fake-dconf ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
preInstall = ''
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20211113/Makefile#L56
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20211202/Makefile#L56
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
'';
|
||||
|
@ -6,17 +6,19 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.4";
|
||||
version = "3.3.5";
|
||||
pname = "glfw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glfw";
|
||||
repo = "GLFW";
|
||||
rev = version;
|
||||
sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw=";
|
||||
sha256 = "sha256-1KkzYclOLGqiV1/8BsJ3e+pXMQ6a+sjLwZ7mjSuxxbA=";
|
||||
};
|
||||
|
||||
patches = lib.optional waylandSupport ./wayland.patch;
|
||||
# Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711)
|
||||
# and linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
|
||||
patches = if waylandSupport then ./wayland.patch else ./x11.patch;
|
||||
|
||||
propagatedBuildInputs = [ libGL ];
|
||||
|
||||
|
18
pkgs/development/libraries/glfw/x11.patch
Normal file
18
pkgs/development/libraries/glfw/x11.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a0be580e..ba143851 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -219,6 +219,13 @@ if (GLFW_BUILD_X11)
|
||||
if (NOT X11_Xshape_INCLUDE_PATH)
|
||||
message(FATAL_ERROR "X Shape headers not found; install libxext development package")
|
||||
endif()
|
||||
+
|
||||
+ target_link_libraries(glfw PRIVATE ${X11_Xrandr_LIB}
|
||||
+ ${X11_Xinerama_LIB}
|
||||
+ ${X11_Xkb_LIB}
|
||||
+ ${X11_Xcursor_LIB}
|
||||
+ ${X11_Xi_LIB}
|
||||
+ ${X11_Xshape_LIB})
|
||||
endif()
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
@ -8,11 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitlist";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bX/Z5FBm21gX4ax/HfqD2bNotZyNFX7dHCEN5uZzQJQ=";
|
||||
sha256 = "sha256-LTrn+PCaqob0EGyyv1V1uCBeDQZvIYE1hNPqi4y/zfc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -24,12 +25,9 @@ buildPythonPackage rec {
|
||||
nose
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "parts~=1.0.3" "parts>=1.0.3"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "bitlist" ];
|
||||
pythonImportsCheck = [
|
||||
"bitlist"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for working with little-endian list representation of bit strings";
|
||||
|
@ -3,11 +3,7 @@
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, tinycss2
|
||||
, pytest
|
||||
, pytest-runner
|
||||
, pytest-cov
|
||||
, pytest-flake8
|
||||
, pytest-isort
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -20,9 +16,15 @@ buildPythonPackage rec {
|
||||
sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/^addopts/d' pyproject.toml
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ tinycss2 ];
|
||||
|
||||
checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "cssselect2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CSS selectors for Python ElementTree";
|
||||
|
@ -11,6 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "fe25519";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -28,7 +29,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fe25519" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
|
||||
--replace "parts~=1.1.2" "parts>=1.1.2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fe25519"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python field operations for Curve25519's prime";
|
||||
|
@ -17,6 +17,11 @@ buildPythonPackage rec {
|
||||
bitlist
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1"
|
||||
'';
|
||||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "ge25519";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -30,7 +31,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ge25519" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "bitlist~=0.5.1" "bitlist>=0.5.1" \
|
||||
--replace "parts~=1.1.2" "parts>=1.1.2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ge25519"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of Ed25519 group elements and operations";
|
||||
|
@ -5,16 +5,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parts";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2212129476f6d285c3aaab309b80b83664d13dca5a42c5ca3500bd32130af7ec";
|
||||
sha256 = "sha256-sfeh6KdprW40ZgfItm9oojDlrI4X29+O7pzfafIawB0=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "parts" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"parts"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for common list functions related to partitioning lists";
|
||||
|
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.20.4";
|
||||
version = "0.20.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bw/NvB4YkdAfm8YyWlLPC4Z0GH9Ez9M9yIjgubiyskw=";
|
||||
sha256 = "sha256-nSkCARZk6K5JMgiXunRBrb3pn5Ti6f493OOFzJYaW0M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -31,12 +31,12 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frama-c";
|
||||
version = "23.1";
|
||||
slang = "Vanadium";
|
||||
version = "24.0";
|
||||
slang = "Chromium";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
|
||||
sha256 = "1rgkq9sg436smw005ag0j6y3xryhjn18a07m5wjfrfp0s1438nnj";
|
||||
sha256 = "sha256:0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DKlKEnvhrdq3pdkSG6muQecsTZYFwRv3w4uptRwuLb4=";
|
||||
sha256 = "sha256-nlIgX7TV3bWi8vaYQ9kXmNzGlVLgRUDNkNApwrAw3EQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DI9N2PX8vvMombx2HfaciACmdM5u+rJLoekg72VGYyI=";
|
||||
vendorSha256 = "sha256-Dmn3LJ+TBO/F3N5lgrNXXrFJ5KTp6r45ZwU11LxvQSg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -1,15 +1,15 @@
|
||||
{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
|
||||
{ lib, rustPlatform, fetchCrate, stdenv, pkg-config, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taplo-cli";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bGQLAANVahpiiiKKJPNmtr4uT5iKHqyLS5yVm+rSHPg=";
|
||||
sha256 = "sha256-+0smR1FDeJMSa/LaRM2M53updt5p8717DEaFItNXCdM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-T3fbG5HKOG90kawjQK8D0PIonB6ErNfR3hVIZ5N8zgA=";
|
||||
cargoSha256 = "sha256-d7mysGYR72shXwvmDXr0oftSa+RtRoSbP++HBR40Mus=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
|
||||
|
@ -5,20 +5,20 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sof-firmware";
|
||||
version = "1.9";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thesofproject";
|
||||
repo = "sof-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yife3gO8lXOGwRye213II9rCQqDic7B7w1xW1o7ajF8=";
|
||||
sha256 = "sha256-aEoLlP34rorllCdTneATlCHnmhJD/VABV9Uv4dDmShA=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cd "v${version}.x"
|
||||
cd "v${lib.versions.majorMinor version}.x"
|
||||
mkdir -p $out/lib/firmware/intel/
|
||||
cp -a sof-v${version} $out/lib/firmware/intel/sof
|
||||
cp -a sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg
|
||||
|
@ -1,29 +1,51 @@
|
||||
{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, libmaxminddb
|
||||
, ncurses
|
||||
, openssl
|
||||
, withGeolocation ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
pname = "goaccess";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
|
||||
sha256 = "sha256-oM4vk5OyYiSE5GnpWoCd/VKt5NQgBJHkPt4fy1KrHIo=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "allinurl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TgreyBlV86K6P0W9WeLUW6RbcHpuOFW2fj2cCe7nWHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
openssl
|
||||
] ++ lib.optionals withGeolocation [
|
||||
libmaxminddb
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gettext
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-utf8"
|
||||
"--with-openssl"
|
||||
] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
|
||||
] ++ lib.optionals withGeolocation [
|
||||
"--enable-geoip=mmdb"
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses openssl ]
|
||||
++ lib.optionals withGeolocation [ libmaxminddb ]
|
||||
++ lib.optionals stdenv.isDarwin [ gettext ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
|
||||
homepage = "https://goaccess.io";
|
||||
changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ ederoyd46 ];
|
||||
homepage = "https://goaccess.io";
|
||||
changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ederoyd46 ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
@ -7,15 +7,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genpass";
|
||||
version = "0.4.12";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~cyplo/genpass";
|
||||
rev = "v${version}";
|
||||
sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l";
|
||||
sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1b9jqkg11d0ih46km063inqqjwfy1nrwb2xb3dagg3hi8hahpqpb";
|
||||
cargoSha256 = "ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.16"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.17"
|
||||
|
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: a517e78b4ff21ff15b7f3ac748476ec8de4d9517
|
||||
ref: refs/tags/6.1.16
|
||||
revision: fc76ef1517b10ab7c84fa47d2cb8528881f29b8b
|
||||
ref: refs/tags/6.1.17
|
||||
specs:
|
||||
metasploit-framework (6.1.16)
|
||||
metasploit-framework (6.1.17)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -128,22 +128,22 @@ GEM
|
||||
arel-helpers (2.12.1)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.534.0)
|
||||
aws-sdk-core (3.123.0)
|
||||
aws-partitions (1.539.0)
|
||||
aws-sdk-core (3.124.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.283.0)
|
||||
aws-sdk-ec2 (1.286.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.63.0)
|
||||
aws-sdk-iam (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.51.0)
|
||||
aws-sdk-kms (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.107.0)
|
||||
aws-sdk-s3 (1.109.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
@ -375,7 +375,7 @@ GEM
|
||||
ruby-macho (2.5.1)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
ruby_smb (2.0.11)
|
||||
ruby_smb (2.0.12)
|
||||
bindata
|
||||
openssl-ccm
|
||||
openssl-cmac
|
||||
|
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.16";
|
||||
version = "6.1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-ppt41H803tYHfPXNLJCfdDzLANLFZHajzVC1UMg7MGQ=";
|
||||
sha256 = "sha256-JkqjqtnWGbW/G74jlDF8/Ai8KvfzmdDybfA3ArVfoEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -104,60 +104,60 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mggk7w7529fxcwvsnmm08ms600nx7nzh51d4kq2d167wf4qqfan";
|
||||
sha256 = "01676g6hsdyzv9ym1f9r59r4jmnh1fl8fr9pqxdnqrysalpdi5gx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.534.0";
|
||||
version = "1.539.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1390d003vnajh3i2k0al4yzw7xchdk17v92vpdwla6yds68x9kh8";
|
||||
sha256 = "1chpydvgwa48rbd67k39fpg2vjp21v3kmjygbjqv1l1sqn6rjbvw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.123.0";
|
||||
version = "3.124.0";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3qvsif62kwdhny226fmnzi4la27qh8hnl0df09w9hiqh6ya0ls";
|
||||
sha256 = "11yclwnfckc4xbhhrr5cy0y5q7vaf51qnvpd1vh5l0x7ngjlx0z3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.283.0";
|
||||
version = "1.286.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ms76yn9iprmvjw1ijrgasss70398i8wmkwmgpghn5wc37z59x2s";
|
||||
sha256 = "1gnjxnmba0wh4ikz7lsgrfzcfmasbqcl4c8r9cvvsw7lk090nkbb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.63.0";
|
||||
version = "1.64.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qac9dd6qriz6ldghkr8ga74zz28jl109kmvhvag74a3qf7k9dwj";
|
||||
sha256 = "1br4h5zwb5ir2bf6y0hnlwafkmghxi2fbjqx86agyv838ndy9npd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.51.0";
|
||||
version = "1.52.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n00hkfy8c44yq23wv0y9aj007mfx1va7jxiaa74g3agf317vrak";
|
||||
sha256 = "0yc96imi4v043rdxa94ncg15aapzp1i5qx076rv25zxqcbkdwzwd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.107.0";
|
||||
version = "1.109.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
@ -664,12 +664,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "a517e78b4ff21ff15b7f3ac748476ec8de4d9517";
|
||||
sha256 = "0r1h7g451dahrnipcr65s80cng3lky82rkgmgh3xdpilgza7i6x6";
|
||||
rev = "fc76ef1517b10ab7c84fa47d2cb8528881f29b8b";
|
||||
sha256 = "0im0bysh4dzhdprd16gkywmbq27wghqr88xy3fzva6fnv6ma6ji6";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.16";
|
||||
version = "6.1.17";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
@ -1337,10 +1337,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06szny4dcbwlcq2fki1fbrghsbk2dgwy3zyl9y8zjkf334yjb57k";
|
||||
sha256 = "103rm0p44w8q2gyw3yigb6k2v12hi7gkj71b2wkj4859jzi96vyb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "theharvester";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laramies";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jG0uVfeAfbX809XTUhoSpYdh2i42NoGzortv96dWEAs=";
|
||||
sha256 = "sha256-Ckouhe/Uq6Dv9p/LRpPQkiKuYrwrl/Z7KkYYamDHav8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -5,12 +5,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "natscli";
|
||||
version = "0.0.26";
|
||||
version = "0.0.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w0a2BzfRKf55hFgdaDLsR2YeC5Jqa2uynlRN2oGPX8g=";
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user