Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-03-07 12:01:33 +00:00 committed by GitHub
commit 8e01330277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
94 changed files with 314 additions and 210 deletions

View File

@ -8544,6 +8544,17 @@
githubId = 25388474;
name = "Matej Urbas";
};
mvisonneau = {
name = "Maxime VISONNEAU";
email = "maxime@visonneau.fr";
matrix = "@maxime:visonneau.fr";
github = "mvisonneau";
githubId = 1761583;
keys = [{
longkeyid = "rsa4096/0x150D6F0AE9198D24";
fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24";
}];
};
mvnetbiz = {
email = "mvnetbiz@gmail.com";
matrix = "@mvtva:matrix.org";

View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchgit
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, help2man
, pkg-config
@ -11,24 +12,25 @@
, boost
, ecasound
, glibcLocales
, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
, libGLU
, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
stdenv.mkDerivation {
pname = "soundscape-renderer-unstable";
pname = "soundscape-renderer";
version = "unstable-2016-11-03";
version = "2016-11-03";
src = fetchgit {
url = "https://github.com/SoundScapeRenderer/ssr";
src = fetchFromGitHub {
owner = "SoundScapeRenderer";
repo = "ssr";
rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9";
sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7";
sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs=";
};
# Without it doesn't find all of the boost libraries.
BOOST_LIB_DIR="${boost}/lib";
BOOST_LIB_DIR = "${boost}/lib";
# uses the deprecated get_generic_category() in boost_system
NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
LC_ALL = "en_US.UTF-8";

View File

@ -3,7 +3,7 @@
}:
let
version = "12.6";
version = "13";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
hash = "sha512-K0HjEO/yw9h+2+Y5CvxyYG1+kx+KH9NSn+QsKCsvh/rG/ilYLYyy93iZfx+wzwrgEfRtfMpZGtDAxd6nyUSnCA==";
hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA==";
};
buildCommand = ''

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "1.1.00";
version = "1.1.01";
nativeBuildInputs = [
p7zip
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-BhruXo/DLBsmvHfoaarVG8cUU+QL4gNpf3M2zQPioUQ=";
sha256 = "sha256-HgyqpZTf9GTsbDi1+e20YNoFIPYtTHQd8KC626G0038=";
};
buildInputs = [

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
version = "4.5.0";
version = "4.5.1";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es=";
sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk=";
};
vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";

View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "22.1.4";
sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n";
vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc=";
version = "22.2.4";
sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369";
vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI=";
}

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-RlEPC9yyPYj974UVto7w+r24Lc5+Et1Ks49o+QTdrZQ=";
sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM=";
};
cargoSha256 = "sha256-4tOeYiRBF4qDUiI6yU093y0Ttq7+CdmGaA5eqdMjgow=";
cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,8 +2,8 @@
}:
let
version = "1.2.2";
sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk=";
version = "1.3.0";
sha256 = "sha256-CFv9gZQHeEiZctJFyB6PJ1dVNkrQ7PlVtgZuteQQTJ0=";
in stdenv.mkDerivation {
pname = "git-vendor";

View File

@ -3,7 +3,7 @@
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems
, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon
}:
with lib;
@ -11,22 +11,25 @@ with lib;
let
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
pname = "gitkraken";
version = "8.2.1";
version = "8.3.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA=";
sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs=";
sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4=";
};
aarch64-darwin = srcs.x86_64-darwin;
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ=";
};
};
src = srcs.${stdenv.hostPlatform.system} or throwSystem;
@ -85,6 +88,8 @@ let
krb5
libdrm
mesa
libxshmfence
libxkbcommon
];
desktopItems = [ (makeDesktopItem {

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "bluedevil";
pname = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
qtbase qtdeclarative bluez-qt

View File

@ -3,7 +3,7 @@
}:
mkDerivation {
name = "breeze-grub";
pname = "breeze-grub";
installPhase = ''
runHook preInstall

View File

@ -3,7 +3,7 @@
let inherit (lib) getLib; in
mkDerivation {
name = "breeze-gtk";
pname = "breeze-gtk";
nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ];
buildInputs = [ qtbase ];
patches = [

View File

@ -24,7 +24,7 @@ in
mkDerivation {
name = "breeze-plymouth";
pname = "breeze-plymouth";
nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
buildInputs = [ plymouth ];
patches = [

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "breeze-qt5";
pname = "breeze-qt5";
sname = "breeze";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [

View File

@ -76,8 +76,8 @@ let
mkDerivation = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (args) pname;
sname = args.sname or pname;
inherit (srcs.${sname}) src version;
outputs = args.outputs or [ "out" ];
@ -98,8 +98,7 @@ let
};
in
mkDerivation (args // {
name = "${name}-${version}";
inherit meta outputs setupHook src;
inherit pname version meta outputs setupHook src;
});
};

View File

@ -32,7 +32,7 @@
}:
mkDerivation {
name = "discover";
pname = "discover";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ];
buildInputs = [
# discount is needed for libmarkdown

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "kactivitymanagerd";
pname = "kactivitymanagerd";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "kde-cli-tools";
pname = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "kde-gtk-config";
pname = "kde-gtk-config";
nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [

View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }:
mkDerivation {
name = "kdecoration";
pname = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n kcoreaddons ];
outputs = [ "out" "dev" ];

View File

@ -8,7 +8,7 @@
}:
mkDerivation {
name = "kdeplasma-addons";
pname = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "kgamma5";
pname = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
}

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "khotkeys";
pname = "khotkeys";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui

View File

@ -9,7 +9,7 @@
}:
mkDerivation {
name = "kinfocenter";
pname = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "kmenuedit";
pname = "kmenuedit";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "kscreen";
pname = "kscreen";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "kscreenlocker";
pname = "kscreenlocker";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "ksshaskpass";
pname = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
}

View File

@ -4,7 +4,7 @@
}:
mkDerivation {
name = "ksystemstats";
pname = "ksystemstats";
NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ];

View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }:
mkDerivation {
name = "kwallet-pam";
pname = "kwallet-pam";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ pam socat libgcrypt qtbase kwallet ];
postPatch = ''

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "kwayland-integration";
pname = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ];
}

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "kwayland-server";
pname = "kwayland-server";
nativeBuildInputs = [
cmake
extra-cmake-modules #kdoctools

View File

@ -18,7 +18,7 @@
# TODO (ttuegel): investigate qmlplugindump failure
mkDerivation {
name = "kwin";
pname = "kwin";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "kwrited";
pname = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
}

View File

@ -4,7 +4,7 @@
}:
mkDerivation {
name = "layer-shell-qt";
pname = "layer-shell-qt";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ];
}

View File

@ -8,7 +8,7 @@
}:
mkDerivation {
name = "libkscreen";
pname = "libkscreen";
nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ];
outputs = [ "out" "dev" ];

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "libksysguard";
pname = "libksysguard";
patches = [
./0001-qdiriterator-follow-symlinks.patch
];

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "milou";
pname = "milou";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "oxygen";
pname = "oxygen";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "plasma-browser-integration";
pname = "plasma-browser-integration";
nativeBuildInputs = [
extra-cmake-modules
];

View File

@ -17,7 +17,7 @@
}:
mkDerivation {
name = "plasma-desktop";
pname = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "plasma-disks";
pname = "plasma-disks";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice

View File

@ -8,7 +8,7 @@
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
mkDerivation {
name = "plasma-integration";
pname = "plasma-integration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "plasma-nano";
pname = "plasma-nano";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
plasma-framework

View File

@ -11,7 +11,7 @@
}:
mkDerivation {
name = "plasma-nm";
pname = "plasma-nm";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "plasma-pa";
pname = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop

View File

@ -16,7 +16,7 @@
let inherit (lib) getBin getLib; in
mkDerivation {
name = "plasma-phone-components";
pname = "plasma-phone-components";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

View File

@ -20,7 +20,7 @@
}:
mkDerivation {
name = "plasma-sdk";
pname = "plasma-sdk";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive

View File

@ -15,7 +15,7 @@
}:
mkDerivation {
name = "plasma-systemmonitor";
pname = "plasma-systemmonitor";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtquickcontrols2

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "plasma-thunderbolt";
pname = "plasma-thunderbolt";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcmutils

View File

@ -14,7 +14,7 @@
}:
mkDerivation {
name = "plasma-vault";
pname = "plasma-vault";
nativeBuildInputs = [ extra-cmake-modules ];
patches = [

View File

@ -1,6 +1,6 @@
{ mkDerivation , extra-cmake-modules }:
mkDerivation {
name = "plasma-workspace-wallpapers";
pname = "plasma-workspace-wallpapers";
nativeBuildInputs = [ extra-cmake-modules ];
}

View File

@ -23,7 +23,7 @@
let inherit (lib) getBin getLib; in
mkDerivation {
name = "plasma-workspace";
pname = "plasma-workspace";
passthru.providedSessions = [ "plasma" "plasmawayland" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View File

@ -5,7 +5,7 @@
}:
mkDerivation {
name = "polkit-kde-agent";
pname = "polkit-kde-agent";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes

View File

@ -7,7 +7,7 @@
}:
mkDerivation {
name = "powerdevil";
pname = "powerdevil";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth

View File

@ -12,7 +12,7 @@
}:
mkDerivation {
name = "qqc2-breeze-style";
pname = "qqc2-breeze-style";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig

View File

@ -17,7 +17,7 @@
}:
mkDerivation {
name = "sddm-kcm";
pname = "sddm-kcm";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
libpthreadstubs

View File

@ -6,7 +6,7 @@
}:
mkDerivation {
name = "systemsettings";
pname = "systemsettings";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice

View File

@ -8,7 +8,7 @@
}:
mkDerivation {
name = "xdg-desktop-portal-kde";
pname = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
buildInputs = [
cups libepoxy mesa pcre pipewire wayland wayland-protocols

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.02.21.00";
version = "2022.02.28.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-QCL+GLc6b4Ae3jUj7VCxnE7Yc1JJ8+P0/r41Zf0KYos=";
sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g=";
};
nativeBuildInputs = [

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libaacs";
version = "0.11.0";
version = "0.11.1";
src = fetchurl {
url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2";
sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d";
sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk=";
};
buildInputs = [ libgcrypt libgpg-error ];

View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psysh";
version = "0.11.1";
version = "0.11.2";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "sha256-OiEXI7AVcC5udISfJ41285OBL82mSd1Xb5qhVtG4p9I=";
sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg=";
};
dontUnpack = true;
@ -26,6 +26,6 @@ mkDerivation {
description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP.";
license = licenses.mit;
homepage = "https://psysh.org/";
maintainers = with maintainers; [ caugner ] ++ teams.php.members;
maintainers = teams.php.members;
};
}

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "cmarkgfm";
version = "0.7.0";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk=";
sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s=";
};
propagatedNativeBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "1.0.3";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = "v${version}";
hash = "sha256-z8X/AZx5Vam7nqYTjhhyXz7E23Crf5vLlNhWXLGSMcs=";
hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw=";
};
propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "0.36.0";
version = "0.36.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-yBkWBIT+FsOk9g3NgBTI3q4hN/dL6gI5UkoZnRcS3Jw=";
sha256 = "sha256-nGM0EY/KcRAl9jwZCNzcSapH7TJSkpJuKF2IfHXUO7M=";
};
propagatedBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "kombu";
version = "5.2.3";
version = "5.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270=";
hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA=";
};
propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
version = "2.0.0a8";
version = "2.0.0a9";
format = "setuptools";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = version;
hash = "sha256-aYFY58zWZlZwW3xwa1iAK4w29AofKIkTyCjQ2nR8JrY=";
hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c=";
};
patches = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyathena";
version = "2.4.1";
version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyAthena";
inherit version;
sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b";
sha256 = "sha256-2Z0KjJm6cWhMTKXa2zBs3Ef2i/e1tqQYZx5sSKIT9a4=";
};
propagatedBuildInputs = [

View File

@ -1,18 +1,35 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pylru";
version = "1.2.0";
version = "1.2.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jlhutch";
repo = pname;
rev = "v${version}";
hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
};
# Check with the next release if tests are ready
doCheck = false;
pythonImportsCheck = [
"pylru"
];
meta = with lib; {
homepage = "https://github.com/jlhutch/pylru";
description = "A least recently used (LRU) cache implementation";
license = licenses.gpl2;
homepage = "https://github.com/jlhutch/pylru";
license = licenses.gpl2Only;
maintainers = with maintainers; [ abbradar ];
};
}

View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pymupdf";
version = "1.19.5";
version = "1.19.6";
src = fetchPypi {
pname = "PyMuPDF";
inherit version;
sha256 = "sha256-OTybnLJmmoaRoBew/bmuDs86Smbypc6jfQqqGikKVaU=";
sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg=";
};
postPatch = ''

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "readme-renderer";
version = "32.0";
version = "33.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "readme_renderer";
inherit version;
sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U=";
sha256 = "sha256-47U7yEvWrwVOTMH+NWfcGuGfVUE0IhBDo/jGdOIiCds=";
};
propagatedBuildInputs = [

View File

@ -7,19 +7,21 @@
, pytest
, pytest-cov
, hypothesis
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "stups-pierone";
version = "1.1.49";
disabled = !isPy3k;
version = "1.1.50";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zalando-stups";
repo = "pierone-cli";
rev = version;
sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q";
hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw=";
};
propagatedBuildInputs = [
@ -28,9 +30,9 @@ buildPythonPackage rec {
stups-zign
];
preCheck = "
preCheck = ''
export HOME=$TEMPDIR
";
'';
checkInputs = [
pytest
@ -38,10 +40,14 @@ buildPythonPackage rec {
hypothesis
];
pythonImportsCheck = [
"pierone"
];
meta = with lib; {
description = "Convenient command line client for STUPS' Pier One Docker registry";
homepage = "https://github.com/zalando-stups/pierone-cli";
license = licenses.asl20;
maintainers = [ maintainers.mschuwalow ];
maintainers = with maintainers; [ mschuwalow ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "webdis";
version = "0.1.19";
version = "0.1.20";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc=";
sha256 = "sha256-QvPawRYmk5HcE4XnI4B4G7AAaN/8cFov9lOa2e++g4A=";
};
buildInputs = [ hiredis http-parser jansson libevent ];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "sha256-uioL4ysioxo+YMCa3VPoUMpY1cVZJ0Jljt8d9jWRT9k=";
sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -29,9 +29,9 @@ let
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit
# 4) run the ./result script that is output by that (it updates ./grammars)
version = "0.20.4";
sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo=";
cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs=";
version = "0.20.6";
sha256 = "sha256-zaxy8VCfJKK8NtfuFFojmmP5a19FP1zO/eB5q1EoQPw=";
cargoSha256 = "sha256-sOOhzm2nz+HC6dvT+8hj/wh19o+OB2zQ6Uz+H89txSA=";
src = fetchFromGitHub {
owner = "tree-sitter";

View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OBcRN0tYNnNqytmmAm6DMtHtp+JzPjomfTpeQEtQE84=";
sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg=";
};
cargoSha256 = "sha256-uZw/ojPAzbpRYb2pkJ/i/+GXvxxU6piCLuMG/fPII2M=";
cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
passthru = {
updateScript = nix-update-script {

View File

@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, fetchpatch
, perl, pkg-config
, libcap, libtool, libxml2, openssl, libuv
, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc
, enableGSSAPI ? true, libkrb5
, enablePython ? false, python3
, enableSeccomp ? false, libseccomp
@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "bind";
version = "9.16.25";
version = "9.18.0";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M=";
sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ perl pkg-config ];
buildInputs = [ libtool libxml2 openssl libuv ]
buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ]
++ lib.optional stdenv.isLinux libcap
++ lib.optional enableSeccomp libseccomp
++ lib.optional enableGSSAPI libkrb5
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
"--with-aes"
] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
++ lib.optional enableSeccomp "--enable-seccomp"
++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}"
++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
postInstall = ''
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
passthru.tests = { inherit (nixosTests) bind; };
meta = with lib; {
homepage = "https://www.isc.org/downloads/bind/";
homepage = "https://www.isc.org/bind/";
description = "Domain name server";
license = licenses.mpl20;

View File

@ -2,38 +2,38 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals
index 82b632ef04..dedfd4d33b 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION);
EXTERN const char *named_g_product INIT(PRODUCT);
EXTERN const char *named_g_description INIT(DESCRIPTION);
EXTERN const char *named_g_srcid INIT(SRCID);
@@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION);
EXTERN const char *named_g_product INIT(PACKAGE_NAME);
EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION);
EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID);
+#if 0
EXTERN const char *named_g_configargs INIT(CONFIGARGS);
EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS);
+#endif
EXTERN const char *named_g_builder INIT(BUILDER);
EXTERN in_port_t named_g_port INIT(0);
EXTERN isc_dscp_t named_g_dscp INIT(-1);
EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER);
EXTERN in_port_t named_g_port INIT(0);
EXTERN in_port_t named_g_tlsport INIT(0);
diff --git a/bin/named/main.c b/bin/named/main.c
index 9ad2d0e277..9729a2b3fc 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -521,7 +521,9 @@ printversion(bool verbose) {
@@ -481,7 +481,9 @@ printversion(bool verbose) {
}
printf("running on %s\n", named_os_uname());
+#if 0
printf("built by %s with %s\n", named_g_builder, named_g_configargs);
printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS);
+#endif
#ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__);
#else /* ifdef __clang__ */
@@ -1089,9 +1091,11 @@ setup(void) {
@@ -1027,9 +1029,11 @@ setup(void) {
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
named_os_uname());
+#if 0
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
named_g_configargs);
PACKAGE_CONFIGARGS);
+#endif
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.663";
version = "0.20.671";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "ZlKjuY3zHciImprDpaiBMnTJZtiegTpjhBcXe4LuYrQ=";
sha256 = "AoOaBryZHkqp5SabfKeW5E1YoJCwGhg2luK8SQvabow=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -19,6 +19,6 @@ buildGoModule rec {
description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights";
homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter";
license = licenses.asl20;
maintainers = [ maintainers.mmahut ];
maintainers = with maintainers; [ mmahut mvisonneau ];
};
}

View File

@ -9,14 +9,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-2DZUQ11sAsIbI3hkU+6Hj+xHz3EbsTelisUCOlRBvvQ=";
arm64-linux_hash = "sha256-j5gUC50NfvF2/W/aYgCiMoW1jF9F30L7pnVaFfX1Fwk=";
x64-osx_hash = "sha256-iOaOzisG54+nstPNNUXOYwhEaM1Uh4wHPISVtEf8vTQ=";
x64-linux_hash = "sha256-4jzQ/bax323r4OzWwr9vq+6x0GasBZhRT+i6bDS/RMs=";
arm64-linux_hash = "sha256-IOFKlqey9biL8wCpbIxMnZZ5Svvrh6KMkNoZ7GBht3M=";
x64-osx_hash = "sha256-tdyEYY6qXNKjMPW652gtPAhTm/aNyTe+CgZ5aA9k2EM=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "4.0.4.5922";
version = "4.0.5.5981";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

View File

@ -19,16 +19,9 @@ let
allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];
blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [];
onlyLicenses = list:
lib.lists.all (license:
let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
if license == l then true else
throw ''${showLicense license} is not an attribute of lib.licenses''
) list;
areLicenseListsValid =
if lib.mutuallyExclusive allowlist blocklist then
assert onlyLicenses allowlist; assert onlyLicenses blocklist; true
true
else
throw "allowlistedLicenses and blocklistedLicenses are not mutually exclusive.";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.39.3";
version = "0.40.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tPjODqBJ85B9uEFExs8z2T/RNKuIvphxX8U1tQLRr+A=";
sha256 = "sha256-4HXAMhX77ISfEpjJWcgj+g9VV0TNMM7lMuoih0NDFJs=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-fHrKg1+9428feTv3wngV2EjJEUqE5ItbwFu7DxXmkCw=";
vendorSha256 = "sha256-yPTjKYtAAx8bijTVA2WEGcb8wGzqRcZH69n3LlVqDD0=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ibus-mozc";
version = "2.26.4423.100";
version = "2.26.4660.102";
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
rev = "7654223979067e3c5ae52ea238d43880c5508f85";
sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0=";
rev = "063c41f1d7c1a877f44c1f8caad6be1897350336";
sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI=";
fetchSubmodules = true;
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.12.1";
version = "2.13.1";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-0v7BD/8Hpl6SLsfWWFC+XCH7Pe2RcziMM6nRTPsOBec=";
sha256 = "sha256-Ui9zj/PI8vYkbT8M13dZ1N4sxhM8fo8ZVeOP9Oa35xg=";
};
vendorSha256 = "sha256-QWOVcdFlUFS1kjLmwo2zY3s/sVSRxkeOVBWPyUYjbss=";
vendorSha256 = "sha256-6+T0UQDrCnoRZkMajyw50eH/AFIUzCgxCkWVmTfycD0=";
doCheck = false;

View File

@ -0,0 +1,69 @@
{ buildPythonApplication
, fetchPypi
, pandocfilters
, panflute
, lib
, pandoc
, pandoc-acro
, texlive
, runCommand
}:
let
pname = "pandoc-acro";
version = "0.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0=";
};
in
buildPythonApplication {
inherit pname version src;
propagatedBuildInputs = [
pandocfilters
panflute
];
# Something in the tests does not typecheck, but the tool works well.
doCheck = false;
passthru.tests.example-doc =
let
env = {
nativeBuildInputs = [
pandoc
pandoc-acro
(texlive.combine {
inherit (texlive)
scheme-tetex
acro
translations
;
})
];
};
in
runCommand "pandoc-acro-example-docs" env ''
set -euo pipefail
exampleFile="${pname}-${version}/tests/example.md"
metadataFile="${pname}-${version}/tests/metadata.yaml"
tar --extract "--file=${src}" "$exampleFile" "$metadataFile"
mkdir $out
pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \
-T pdf -o $out/example.pdf
pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \
-T txt -o $out/example.txt
! grep -q "\+afaik" $out/example.txt
'';
meta = with lib; {
homepage = "https://pypi.org/project/pandoc-acro/";
description = "Pandoc filter which manages acronyms in Pandoc flavored Markdown sources";
license = licenses.bsd2;
maintainers = with maintainers; [ tfc ];
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "wakatime";
version = "1.37.0";
version = "1.38.0";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
rev = "v${version}";
sha256 = "sha256-1JOsE8u4+LlWL9nU/fXIqVME1VsgxZV84lJXNTY2pZg=";
sha256 = "sha256-nlv0NOvUi/yf2lQytdfRE7YwcSpRHQRlI0zzeKAA760=";
};
vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y=";

View File

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "kubescape";
version = "2.0.148";
version = "2.0.149";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
hash = "sha256-Wn/yVGAAdAaIsHUDWWqVyAlOTYIXpbwIktX9h4LN+fQ=";
hash = "sha256-m6tJjC5BXxFC+bSOHbKXXGZQlJIM0+fIA+JYWBntgk8=";
};
nativeBuildInputs = [
installShellFiles
];
vendorSha256 = "sha256-xbOUggbu/4bNT07bD3TU/7CIDvgi6OtZLQzSqQykwRY=";
vendorSha256 = "sha256-vplHaaT7x0ZSpvityJF5aGKDARvGPBT9DMltOpUkOMo=";
ldflags = [
"-s"

View File

@ -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.31"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.32"

View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 2bed5461f9e43e2608a90c3331045b62e8dba26a
ref: refs/tags/6.1.31
revision: f7cd9896b753377c4c663188b6c26500b7850f41
ref: refs/tags/6.1.32
specs:
metasploit-framework (6.1.31)
metasploit-framework (6.1.32)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -31,7 +31,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 2.0.75)
metasploit-payloads (= 2.0.77)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.18)
mqtt
@ -128,13 +128,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.559.0)
aws-sdk-core (3.127.0)
aws-partitions (1.563.0)
aws-sdk-core (3.128.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.300.0)
aws-sdk-ec2 (1.302.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.68.0)
@ -173,8 +173,8 @@ GEM
eventmachine (>= 1.0.0.beta.4)
erubi (1.10.0)
eventmachine (1.2.7)
faker (2.19.0)
i18n (>= 1.6, < 2)
faker (2.20.0)
i18n (>= 1.8.11, < 2)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0)
activesupport (~> 6.0)
railties (~> 6.0)
metasploit-payloads (2.0.75)
metasploit-payloads (2.0.77)
metasploit_data_models (5.0.4)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -379,7 +379,7 @@ GEM
ruby-macho (3.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
ruby_smb (3.0.4)
ruby_smb (3.0.5)
bindata
openssl-ccm
openssl-cmac

View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.31";
version = "6.1.32";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw=";
sha256 = "sha256-UoH+tp3I9YTXXNXDaYne1E9Zpoj9fbr7mnIQws6TXJs=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw";
sha256 = "0l4f97kmsz1niicj52bm88ggbq3lvn41w0cckfwksh4yikjh20wv";
type = "gem";
};
version = "1.559.0";
version = "1.563.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";
sha256 = "0xpqx000gq1j0n211c9bch5b2rc48a54kxk87m6y8z844c0wlqk7";
type = "gem";
};
version = "3.127.0";
version = "3.128.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd";
sha256 = "13x9rwkykyw873prd2k9pqwrjkf9jsqih9aksbf9fn8hfnsv6db8";
type = "gem";
};
version = "1.300.0";
version = "1.302.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -334,10 +334,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw";
sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi";
type = "gem";
};
version = "2.19.0";
version = "2.20.0";
};
faraday = {
groups = ["default"];
@ -684,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a";
sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs";
rev = "f7cd9896b753377c4c663188b6c26500b7850f41";
sha256 = "16swjg7c443jkbxvlzgxi2k5jkylvs4nkhymbkbq9xf8knvgx0aj";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.31";
version = "6.1.32";
};
metasploit-model = {
groups = ["default"];
@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z";
sha256 = "0chd5rn13210fgsvm0yqd59lfgg9kpmyx82jbf33dfiw6qh6mmi1";
type = "gem";
};
version = "2.0.75";
version = "2.0.77";
};
metasploit_data_models = {
groups = ["default"];
@ -1357,10 +1357,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w7ywnf3b3dsfqarj9yc21q1f5p29vs359x5d7sipvc0ljdwn95l";
sha256 = "0zgw3aplb0nd8ggyy2csywvnw7gdligzdqvw18j7s5yix8g2h4cz";
type = "gem";
};
version = "3.0.4";
version = "3.0.5";
};
rubyntlm = {
groups = ["default"];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruplacer";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "TankerHQ";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5r1OywctKAeSBPzjYSPith1QNxRH0hman7lnSym2XIY=";
sha256 = "sha256-jLGstlEqABT4ejdYlTQZaBVeYy86+lqIilyufPGIZyQ=";
};
cargoSha256 = "sha256-JrVPEuGBVo+NCsZ1DH/Af8OLWiNXnQIBxiOukw+W5Qo=";
cargoSha256 = "sha256-cv+g68WQvnnd0qZDB9PfZLbsdrM+RXs27a0Q5YPiHDQ=";
buildInputs = (lib.optional stdenv.isDarwin Security);

View File

@ -8278,6 +8278,8 @@ with pkgs;
pa_applet = callPackage ../tools/audio/pa-applet { };
pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { };
pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };
@ -27934,7 +27936,7 @@ with pkgs;
navipowm = callPackage ../applications/misc/navipowm { };
netbeans = callPackage ../applications/editors/netbeans {
jdk = jdk11;
jdk = jdk17;
};
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };