Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ lib, python3Packages, fetchFromGitHub, libxslt,
|
||||
gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
|
||||
gobject-introspection, gtk3, wrapGAppsHook, gnome }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wpgtk";
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
wrapGAppsHook
|
||||
gtk3
|
||||
gobject-introspection
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
libxslt
|
||||
];
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs";
|
||||
description = "A tool to help manage well known user directories like the desktop folder and the music folder";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ lethalman ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
, vala
|
||||
, gettext
|
||||
, perl
|
||||
, gnome3
|
||||
, gnome
|
||||
, gdk-pixbuf
|
||||
, zlib
|
||||
}:
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "none";
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
|
||||
{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gvolicon-2014-04-28";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme
|
||||
makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme
|
||||
librsvg wrapGAppsHook
|
||||
];
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
|
||||
, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
|
||||
, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
|
||||
, xlibsWrapper, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, bluez-tools
|
||||
, cinnamon
|
||||
, gnome3
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, intltool
|
||||
, pavucontrol
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
bluez-tools
|
||||
cinnamon.xapps
|
||||
gnome3.gnome-bluetooth
|
||||
gnome.gnome-bluetooth
|
||||
python3Packages.python
|
||||
util-linux
|
||||
];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
|
||||
, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2
|
||||
, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
|
||||
, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
|
||||
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
|
||||
|
||||
let
|
||||
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [ bluez gtk3 pythonPackages.python librsvg
|
||||
gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ]
|
||||
gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ]
|
||||
++ pythonPath
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fcitx-configtool-0.4.10";
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ];
|
||||
buildInputs = [ fcitx isocodes gtk3 gnome.adwaita-icon-theme ];
|
||||
|
||||
# Patch paths to `fcitx-remote`
|
||||
prePatch = ''
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://micans.org/apparix";
|
||||
description = "Add directory bookmarks, distant listing, and distant editing to the command line";
|
||||
maintainers = with maintainers; [ lethalman ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
|
||||
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome
|
||||
, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2
|
||||
, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
|
||||
}:
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--disable-doc" ];
|
||||
|
||||
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ];
|
||||
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ];
|
||||
nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }:
|
||||
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version="1.1.3";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ];
|
||||
buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kodi-cli";
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
cp -a kodi-cli $out/bin
|
||||
wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
|
||||
cp -a playlist_to_kodi $out/bin
|
||||
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
|
||||
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://launchpad.net/pastebinit";
|
||||
description = "A software that lets you send anything you want directly to a pastebin from the command line";
|
||||
maintainers = with maintainers; [ lethalman raboof ];
|
||||
maintainers = with maintainers; [ raboof ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
, gettext
|
||||
, gupnp-av
|
||||
, gtksourceview4
|
||||
, gnome3
|
||||
, gnome
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gupnp-av
|
||||
gtksourceview4
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, gettext
|
||||
, pkg-config
|
||||
, networkmanager
|
||||
, gnome3
|
||||
, gnome
|
||||
, libnotify
|
||||
, libsecret
|
||||
, polkit
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
glib
|
||||
glib-networking
|
||||
libappindicator-gtk3
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanagerapplet";
|
||||
versionPolicy = "odd-unstable";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus
|
||||
, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala
|
||||
, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala
|
||||
, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit
|
||||
, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
|
||||
, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt
|
||||
@@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager";
|
||||
};
|
||||
@@ -106,7 +106,7 @@ in stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Projects/NetworkManager";
|
||||
description = "Network configuration and management tool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace maxeaubrey ];
|
||||
maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]);
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
, ppp
|
||||
, libsecret
|
||||
, withGnome ? true
|
||||
, gnome3
|
||||
, gnome
|
||||
, fetchpatch
|
||||
, libnma
|
||||
}:
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-fortisslvpn";
|
||||
versionPolicy = "odd-unstable";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3
|
||||
, withGnome ? true, gnome3, fetchpatch, libnma, glib }:
|
||||
, withGnome ? true, gnome, fetchpatch, libnma, glib }:
|
||||
|
||||
let
|
||||
pname = "NetworkManager-iodine";
|
||||
@@ -44,7 +44,7 @@ in stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-iodine";
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
, pkg-config
|
||||
, vala
|
||||
, networkmanager
|
||||
, gnome3
|
||||
, gnome
|
||||
, isocodes
|
||||
, libxml2
|
||||
, docbook_xsl
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
, file
|
||||
, gtk3
|
||||
, withGnome ? true
|
||||
, gnome3
|
||||
, gnome
|
||||
, kmod
|
||||
, fetchpatch
|
||||
}:
|
||||
@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-openconnect";
|
||||
versionPolicy = "odd-unstable";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret
|
||||
, gtk3, withGnome ? true, gnome3, kmod, libnma }:
|
||||
, gtk3, withGnome ? true, gnome, kmod, libnma }:
|
||||
|
||||
let
|
||||
pname = "NetworkManager-openvpn";
|
||||
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-openvpn";
|
||||
versionPolicy = "odd-unstable";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, fetchpatch
|
||||
, file
|
||||
, glib
|
||||
, gnome3
|
||||
, gnome
|
||||
, gtk3
|
||||
, intltool
|
||||
, libnma
|
||||
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-sstp";
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM
|
||||
, gtk3, gnome3, libsecret, libnma }:
|
||||
, gtk3, gnome, libsecret, libnma }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NetworkManager-strongswan";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret
|
||||
, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }:
|
||||
, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }:
|
||||
let
|
||||
pname = "NetworkManager-vpnc";
|
||||
version = "1.2.6";
|
||||
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-vpnc";
|
||||
versionPolicy = "odd-unstable";
|
||||
|
||||
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.tracebox.org/";
|
||||
description = "A middlebox detection tool";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://sourceforge.net/projects/crunch-wordlist/";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ lethalman lnl7 ];
|
||||
maintainers = with maintainers; [ lnl7 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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.0.42"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c
|
||||
ref: refs/tags/6.0.42
|
||||
revision: 08fd394933eadca2b90e4de4ecce7f478af1f161
|
||||
ref: refs/tags/6.0.43
|
||||
specs:
|
||||
metasploit-framework (6.0.42)
|
||||
metasploit-framework (6.0.43)
|
||||
actionpack (~> 5.2.2)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
@@ -23,6 +23,7 @@ GIT
|
||||
faye-websocket
|
||||
filesize
|
||||
hrr_rb_ssh (= 0.3.0.pre2)
|
||||
http-cookie
|
||||
irb
|
||||
jsobfu
|
||||
json
|
||||
@@ -30,7 +31,7 @@ GIT
|
||||
metasploit-concern (~> 3.0.0)
|
||||
metasploit-credential (~> 4.0.0)
|
||||
metasploit-model (~> 3.1.0)
|
||||
metasploit-payloads (= 2.0.44)
|
||||
metasploit-payloads (= 2.0.45)
|
||||
metasploit_data_models (~> 4.1.0)
|
||||
metasploit_payloads-mettle (= 1.0.9)
|
||||
mqtt
|
||||
@@ -92,26 +93,26 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.1.0)
|
||||
actionpack (5.2.5)
|
||||
actionview (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
actionpack (5.2.6)
|
||||
actionview (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
actionview (5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activemodel (5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activerecord (5.2.5)
|
||||
activemodel (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
activemodel (5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
activerecord (5.2.6)
|
||||
activemodel (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
arel (>= 9.0)
|
||||
activesupport (5.2.5)
|
||||
activesupport (5.2.6)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
@@ -123,7 +124,7 @@ GEM
|
||||
arel-helpers (2.12.0)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.1.1)
|
||||
aws-partitions (1.449.0)
|
||||
aws-partitions (1.452.0)
|
||||
aws-sdk-core (3.114.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
@@ -138,7 +139,7 @@ GEM
|
||||
aws-sdk-kms (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.94.0)
|
||||
aws-sdk-s3 (1.94.1)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
@@ -152,9 +153,11 @@ GEM
|
||||
concurrent-ruby (1.0.5)
|
||||
cookiejar (0.3.3)
|
||||
crass (1.0.6)
|
||||
daemons (1.3.1)
|
||||
daemons (1.4.0)
|
||||
dnsruby (1.61.5)
|
||||
simpleidn (~> 0.1)
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
ed25519 (1.2.4)
|
||||
em-http-request (1.1.7)
|
||||
addressable (>= 2.3.4)
|
||||
@@ -184,6 +187,8 @@ GEM
|
||||
hashery (2.1.2)
|
||||
hrr_rb_ssh (0.3.0.pre2)
|
||||
ed25519 (~> 1.2)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.10)
|
||||
concurrent-ruby (~> 1.0)
|
||||
@@ -216,7 +221,7 @@ GEM
|
||||
activemodel (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
railties (~> 5.2.2)
|
||||
metasploit-payloads (2.0.44)
|
||||
metasploit-payloads (2.0.45)
|
||||
metasploit_data_models (4.1.4)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
@@ -263,7 +268,7 @@ GEM
|
||||
ttfunk
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.2.2)
|
||||
puma (5.3.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
@@ -276,9 +281,9 @@ GEM
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.5)
|
||||
actionpack (= 5.2.5)
|
||||
activesupport (= 5.2.5)
|
||||
railties (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
activesupport (= 5.2.6)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
|
||||
@@ -8,13 +8,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.0.42";
|
||||
version = "6.0.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU=";
|
||||
sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -4,50 +4,50 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m";
|
||||
sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
actionview = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i";
|
||||
sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activemodel = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b";
|
||||
sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activerecord = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj";
|
||||
sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
activesupport = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj";
|
||||
sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
addressable = {
|
||||
groups = ["default"];
|
||||
@@ -114,10 +114,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4";
|
||||
sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.449.0";
|
||||
version = "1.452.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
@@ -164,10 +164,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9";
|
||||
sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.94.0";
|
||||
version = "1.94.1";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
@@ -264,10 +264,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
|
||||
sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
};
|
||||
dnsruby = {
|
||||
groups = ["default"];
|
||||
@@ -279,6 +279,16 @@
|
||||
};
|
||||
version = "1.61.5";
|
||||
};
|
||||
domain_name = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.20190701";
|
||||
};
|
||||
ed25519 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@@ -419,6 +429,16 @@
|
||||
};
|
||||
version = "0.3.0.pre2";
|
||||
};
|
||||
http-cookie = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
"http_parser.rb" = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@@ -534,12 +554,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c";
|
||||
sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg";
|
||||
rev = "08fd394933eadca2b90e4de4ecce7f478af1f161";
|
||||
sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.0.42";
|
||||
version = "6.0.43";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
@@ -556,10 +576,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y";
|
||||
sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.44";
|
||||
version = "2.0.45";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
@@ -826,10 +846,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
|
||||
sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.2";
|
||||
version = "5.3.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
@@ -896,10 +916,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9";
|
||||
sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }:
|
||||
{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "onioncircuits";
|
||||
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/onioncircuits" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share"
|
||||
--prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.4.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII=";
|
||||
sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938=";
|
||||
vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs=";
|
||||
|
||||
# tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
||||
@@ -87,6 +87,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = "https://www.netdata.cloud/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,6 +26,6 @@ buildGoModule rec {
|
||||
description = "Netdata orchestrator for data collection modules written in go";
|
||||
homepage = "https://github.com/netdata/go.d.plugin";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.lethalman ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
, libdazzle
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, gnome3
|
||||
, gnome
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -143,7 +143,7 @@ core = stdenv.mkDerivation rec {
|
||||
description = "Basic binaries for TeX Live";
|
||||
homepage = "http://www.tug.org/texlive";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ];
|
||||
maintainers = with maintainers; [ veprbl lovek323 raskin jwiegley ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user