Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
68a45fb1f2
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "setzer";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvfosammmm";
|
||||
repo = "Setzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY=";
|
||||
hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foxotron";
|
||||
version = "2021-08-13";
|
||||
version = "2022-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w=";
|
||||
sha256 = "sha256-DvNW7VGMZyefLhmmLdkf6AnGbuudZW6Yj/MFXw6HgXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batsignal";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electrickite";
|
||||
repo = "batsignal";
|
||||
rev = version;
|
||||
sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U=";
|
||||
sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI=";
|
||||
};
|
||||
|
||||
buildInputs = [ libnotify glib ];
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.18.5";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y=";
|
||||
sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk=";
|
||||
};
|
||||
|
||||
# Because there's a test that requires terminal access
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk=";
|
||||
cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal user interface for taskwarrior ";
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "83.0.4254.54";
|
||||
version = "84.0.4316.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k=";
|
||||
sha256 = "sha256-CEKUd2QlZQJbpBO1t4oKmyd+uhPiCOY+eXtSrZf75e4=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.72";
|
||||
version = "1.2.73";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-svnZBzFYKj9hIjv4SqPSP65rKIeWQqs2qwnx8J7dUIg=";
|
||||
sha256 = "sha256-E16p40Pmr9o2946XlO3TUE/xUueG0NBWux23MgAVLlI=";
|
||||
};
|
||||
vendorSha256 = "sha256-75uCGxW6Gqfhk5oImz26fUR8BeGHkikXHGJcCH32MxQ=";
|
||||
vendorSha256 = "sha256-NHeUj1JWRqElY2BpQ+7ANqwlOYQ5H2R00LGqktcsoF4=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
let
|
||||
pname = "cozydrive";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage";
|
||||
sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs";
|
||||
sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a";
|
||||
};
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.7.7";
|
||||
version = "3.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
|
||||
sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY=";
|
||||
sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "22.3.0";
|
||||
version = "22.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg=";
|
||||
sha256 = "sha256-xK4C+0/Qpc2vXPmsI8KuHuDJLmJ5LXdAfRIREE+gkWA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.7.8";
|
||||
version = "1.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NZlPcr13onxgbmKPdv0ODOhYDT5T+OeSvHE8VGOGyo4=";
|
||||
sha256 = "sha256-u5/BUAkaxu+uKLemYggIGtMP4E4eevw0gDI7R4LxnoA=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
|
||||
, wayland, libxkbcommon, pcre, json_c, libevdev
|
||||
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
|
||||
, wlroots, wayland-protocols, libdrm
|
||||
, nixosTests
|
||||
|
|
@ -8,8 +8,19 @@
|
|||
, isNixOS ? false
|
||||
|
||||
, enableXWayland ? true
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
, dbusSupport ? true
|
||||
, dbus
|
||||
, trayEnabled ? dbusSupport
|
||||
}:
|
||||
|
||||
# The "sd-bus-provider" meson option does not include a "none" option,
|
||||
# but it is silently ignored iff "-Dtray=disabled". We use "basu"
|
||||
# (which is not in nixpkgs) instead of "none" to alert us if this
|
||||
# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761
|
||||
assert trayEnabled -> systemdSupport && dbusSupport;
|
||||
let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sway-unwrapped";
|
||||
version = "1.7";
|
||||
|
|
@ -47,16 +58,18 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland libxkbcommon pcre json_c dbus libevdev
|
||||
wayland libxkbcommon pcre json_c libevdev
|
||||
pango cairo libinput libcap pam gdk-pixbuf librsvg
|
||||
wayland-protocols libdrm
|
||||
(wlroots.override { inherit enableXWayland; })
|
||||
] ++ lib.optionals dbusSupport [
|
||||
dbus
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsd-bus-provider=libsystemd"
|
||||
]
|
||||
mesonFlags =
|
||||
[ "-Dsd-bus-provider=${sd-bus-provider}" ]
|
||||
++ lib.optional (!enableXWayland) "-Dxwayland=disabled"
|
||||
++ lib.optional (!trayEnabled) "-Dtray=disabled"
|
||||
;
|
||||
|
||||
passthru.tests.basic = nixosTests.sway;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, isNixOS ? false
|
||||
|
||||
, enableXWayland ? true
|
||||
, dbusSupport ? true
|
||||
}:
|
||||
|
||||
assert extraSessionCommands != "" -> withBaseWrapper;
|
||||
|
|
@ -27,7 +28,7 @@ let
|
|||
export DBUS_SESSION_BUS_ADDRESS
|
||||
exec ${sway}/bin/sway "$@"
|
||||
else
|
||||
exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@"
|
||||
exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@"
|
||||
fi
|
||||
'';
|
||||
in symlinkJoin {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
|
||||
|
||||
strictDeps = true;
|
||||
dontAddWafCrossFlags = true;
|
||||
wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for audio labelling";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.0.2";
|
||||
version = "22.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28";
|
||||
sha256 = "sha256-cXolz4hKLSTs8K9tCxaKnC2Pr0lQ0M+pPeF2w6bOAR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,23 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libschrift";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomolt";
|
||||
repo = pname;
|
||||
rev = "c207585486b3e78ec5506f55f5d56178f421a53c";
|
||||
sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1";
|
||||
rev = "v" + version;
|
||||
sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv";
|
||||
};
|
||||
|
||||
# fix a compilation failure related to darwin integers, remove at next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch";
|
||||
sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk \
|
||||
--replace "PREFIX = /usr/local" "PREFIX = $out"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
let params =
|
||||
if lib.versionAtLeast ocaml.version "4.13"
|
||||
then {
|
||||
version = "1.9.1";
|
||||
sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g";
|
||||
version = "1.10.3";
|
||||
sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE=";
|
||||
} else if lib.versionAtLeast ocaml.version "4.12"
|
||||
then {
|
||||
version = "1.9.0";
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupa";
|
||||
version = "1.10";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE=";
|
||||
sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.913";
|
||||
version = "2.0.918";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gSWD3Y7yySJvWicL5zgCGvMWfk98mBdTXB+Xwo4fork=";
|
||||
hash = "sha256-8nhz32ugnheBH1W3YKKmjRvjjx4WcpSyLwBS0STvsPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wa5K21QGI43sZkv7xgatf37Wqy9RT3S7HQBsjGUZovA=";
|
||||
sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PpLZOQd4r50LWJwB2WX5IrRyzYhWgsv9wOqm/sZCaug=";
|
||||
cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
|
|
|
|||
23
pkgs/development/tools/biodiff/default.nix
Normal file
23
pkgs/development/tools/biodiff/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "biodiff";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8051Enthusiast";
|
||||
repo = "biodiff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hex diff viewer using alignment algorithms from biology";
|
||||
homepage = "https://github.com/8051Enthusiast/biodiff";
|
||||
changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ newam ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "protoc-gen-grpc-web";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc-web";
|
||||
rev = version;
|
||||
sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
|
||||
sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/javascript/net/grpc/web/generator";
|
||||
|
|
@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ protobuf ];
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/grpc/grpc-web/pull/1210
|
||||
./optional-static.patch
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ protobuf ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11
|
||||
LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl
|
||||
PREFIX ?= /usr/local
|
||||
MIN_MACOS_VERSION := 10.7 # Supports OS X Lion
|
||||
+STATIC ?= yes
|
||||
|
||||
UNAME_S := $(shell uname -s)
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION)
|
||||
else ifeq ($(UNAME_S),Linux)
|
||||
- LDFLAGS += -static
|
||||
+ ifeq ($(STATIC),yes)
|
||||
+ LDFLAGS += -static
|
||||
+ endif
|
||||
endif
|
||||
|
||||
all: protoc-gen-grpc-web
|
||||
|
|
@ -11,11 +11,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grails";
|
||||
version = "4.1.0.M1";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
|
||||
sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr";
|
||||
sha256 = "sha256-S8YDGShglCB8zMHBwLlvPwq9dIAgQq2Xb8G1Pf0dXiQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ flex ]
|
||||
++ lib.optional stdenv.buildPlatform.isDarwin gettext;
|
||||
|
||||
buildInputs = [ cracklib db4 audit ]
|
||||
buildInputs = [ cracklib db4 ]
|
||||
++ lib.optional stdenv.buildPlatform.isLinux audit
|
||||
++ lib.optional withLibxcrypt libxcrypt;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.11.3";
|
||||
version = "1.11.4";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-kIV6XMicvBdtNOt3BJsOK/KZO3zQLuPgastMVoY8jM8=";
|
||||
sha256 = "sha256-dQwJ3HzzYxolGrjgHXBElDZO65uXJKEv8UH5sYZ4swc=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
vendorSha256 = "sha256-7oQGoMR7woN2RaEMCap9OWJdtGL4MvLN+FTKLqJHsCk=";
|
||||
vendorSha256 = "sha256-VB7agtH6V7mJU689bFXuhi82qqzGxY16vFOPFBd/DQc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +1,16 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-mjolnir-antispam";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
|
||||
sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch";
|
||||
sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4=";
|
||||
stripLen = 1;
|
||||
})
|
||||
# Port to Synapse module API (needs Synapse >= 1.37.0)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch";
|
||||
sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo=";
|
||||
stripLen = 1;
|
||||
excludes = [
|
||||
"README.md"
|
||||
"mx-tester.yml"
|
||||
];
|
||||
})
|
||||
# Move glob_to_regex into the source
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch";
|
||||
sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "./source/synapse_antispam";
|
||||
|
||||
propagatedBuildInputs = [ matrix-synapse ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mjolnir";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
|
||||
sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -67,13 +67,13 @@ let
|
|||
sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==";
|
||||
};
|
||||
};
|
||||
"@jest/types-27.4.2" = {
|
||||
"@jest/types-27.5.1" = {
|
||||
name = "_at_jest_slash_types";
|
||||
packageName = "@jest/types";
|
||||
version = "27.4.2";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz";
|
||||
sha512 = "j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==";
|
||||
url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz";
|
||||
sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==";
|
||||
};
|
||||
};
|
||||
"@selderee/plugin-htmlparser2-0.6.0" = {
|
||||
|
|
@ -103,6 +103,15 @@ let
|
|||
sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==";
|
||||
};
|
||||
};
|
||||
"@types/config-0.0.41" = {
|
||||
name = "_at_types_slash_config";
|
||||
packageName = "@types/config";
|
||||
version = "0.0.41";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz";
|
||||
sha512 = "HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA==";
|
||||
};
|
||||
};
|
||||
"@types/connect-3.4.35" = {
|
||||
name = "_at_types_slash_connect";
|
||||
packageName = "@types/connect";
|
||||
|
|
@ -112,13 +121,13 @@ let
|
|||
sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==";
|
||||
};
|
||||
};
|
||||
"@types/crypto-js-4.1.0" = {
|
||||
"@types/crypto-js-4.1.1" = {
|
||||
name = "_at_types_slash_crypto-js";
|
||||
packageName = "@types/crypto-js";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.0.tgz";
|
||||
sha512 = "DCFfy/vh2lG6qHSGezQ+Sn2Ulf/1Mx51dqOdmOKyW5nMK3maLlxeS3onC7r212OnBM2pBR95HkAmAjjF08YkxQ==";
|
||||
url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.1.tgz";
|
||||
sha512 = "BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA==";
|
||||
};
|
||||
};
|
||||
"@types/express-4.17.13" = {
|
||||
|
|
@ -139,6 +148,15 @@ let
|
|||
sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==";
|
||||
};
|
||||
};
|
||||
"@types/html-to-text-8.0.1" = {
|
||||
name = "_at_types_slash_html-to-text";
|
||||
packageName = "@types/html-to-text";
|
||||
version = "8.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.0.1.tgz";
|
||||
sha512 = "0B/OifmJYmk5r9z9+KJtGWOF0LEjbTN4D2QeCh+mAw81JkJwC83NvNWUZFEqRT5PpnjX7vX0ab1SMGcwCs3Lag==";
|
||||
};
|
||||
};
|
||||
"@types/istanbul-lib-coverage-2.0.4" = {
|
||||
name = "_at_types_slash_istanbul-lib-coverage";
|
||||
packageName = "@types/istanbul-lib-coverage";
|
||||
|
|
@ -202,13 +220,13 @@ let
|
|||
sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==";
|
||||
};
|
||||
};
|
||||
"@types/node-16.11.22" = {
|
||||
"@types/node-16.11.25" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "16.11.22";
|
||||
version = "16.11.25";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz";
|
||||
sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz";
|
||||
sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ==";
|
||||
};
|
||||
};
|
||||
"@types/parse5-6.0.3" = {
|
||||
|
|
@ -301,13 +319,13 @@ let
|
|||
sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==";
|
||||
};
|
||||
};
|
||||
"accepts-1.3.7" = {
|
||||
"accepts-1.3.8" = {
|
||||
name = "accepts";
|
||||
packageName = "accepts";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
|
||||
sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
|
||||
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
|
||||
sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
|
||||
};
|
||||
};
|
||||
"acorn-7.4.1" = {
|
||||
|
|
@ -373,13 +391,13 @@ let
|
|||
sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
|
||||
};
|
||||
};
|
||||
"ajv-8.9.0" = {
|
||||
"ajv-8.10.0" = {
|
||||
name = "ajv";
|
||||
packageName = "ajv";
|
||||
version = "8.9.0";
|
||||
version = "8.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz";
|
||||
sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==";
|
||||
url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz";
|
||||
sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==";
|
||||
};
|
||||
};
|
||||
"ansi-colors-4.1.1" = {
|
||||
|
|
@ -571,13 +589,13 @@ let
|
|||
sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
|
||||
};
|
||||
};
|
||||
"body-parser-1.19.1" = {
|
||||
"body-parser-1.19.2" = {
|
||||
name = "body-parser";
|
||||
packageName = "body-parser";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz";
|
||||
sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==";
|
||||
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz";
|
||||
sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
|
||||
};
|
||||
};
|
||||
"brace-expansion-1.1.11" = {
|
||||
|
|
@ -634,13 +652,13 @@ let
|
|||
sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
|
||||
};
|
||||
};
|
||||
"bytes-3.1.1" = {
|
||||
"bytes-3.1.2" = {
|
||||
name = "bytes";
|
||||
packageName = "bytes";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz";
|
||||
sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==";
|
||||
url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz";
|
||||
sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==";
|
||||
};
|
||||
};
|
||||
"callsites-3.1.0" = {
|
||||
|
|
@ -805,13 +823,13 @@ let
|
|||
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
|
||||
};
|
||||
};
|
||||
"cookie-0.4.1" = {
|
||||
"cookie-0.4.2" = {
|
||||
name = "cookie";
|
||||
packageName = "cookie";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
|
||||
sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
|
||||
sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
|
||||
};
|
||||
};
|
||||
"cookie-signature-1.0.6" = {
|
||||
|
|
@ -1012,13 +1030,13 @@ let
|
|||
sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==";
|
||||
};
|
||||
};
|
||||
"diff-sequences-27.4.0" = {
|
||||
"diff-sequences-27.5.1" = {
|
||||
name = "diff-sequences";
|
||||
packageName = "diff-sequences";
|
||||
version = "27.4.0";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz";
|
||||
sha512 = "YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==";
|
||||
url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz";
|
||||
sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==";
|
||||
};
|
||||
};
|
||||
"discontinuous-range-1.0.0" = {
|
||||
|
|
@ -1327,22 +1345,22 @@ let
|
|||
sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
|
||||
};
|
||||
};
|
||||
"expect-27.4.6" = {
|
||||
"expect-27.5.1" = {
|
||||
name = "expect";
|
||||
packageName = "expect";
|
||||
version = "27.4.6";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz";
|
||||
sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag==";
|
||||
url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz";
|
||||
sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==";
|
||||
};
|
||||
};
|
||||
"express-4.17.2" = {
|
||||
"express-4.17.3" = {
|
||||
name = "express";
|
||||
packageName = "express";
|
||||
version = "4.17.2";
|
||||
version = "4.17.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz";
|
||||
sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==";
|
||||
url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz";
|
||||
sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==";
|
||||
};
|
||||
};
|
||||
"extend-3.0.2" = {
|
||||
|
|
@ -1579,13 +1597,13 @@ let
|
|||
sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
|
||||
};
|
||||
};
|
||||
"globals-13.12.0" = {
|
||||
"globals-13.12.1" = {
|
||||
name = "globals";
|
||||
packageName = "globals";
|
||||
version = "13.12.0";
|
||||
version = "13.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz";
|
||||
sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==";
|
||||
url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz";
|
||||
sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==";
|
||||
};
|
||||
};
|
||||
"graceful-fs-4.2.9" = {
|
||||
|
|
@ -1948,40 +1966,40 @@ let
|
|||
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
|
||||
};
|
||||
};
|
||||
"jest-diff-27.4.6" = {
|
||||
"jest-diff-27.5.1" = {
|
||||
name = "jest-diff";
|
||||
packageName = "jest-diff";
|
||||
version = "27.4.6";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz";
|
||||
sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==";
|
||||
url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz";
|
||||
sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==";
|
||||
};
|
||||
};
|
||||
"jest-get-type-27.4.0" = {
|
||||
"jest-get-type-27.5.1" = {
|
||||
name = "jest-get-type";
|
||||
packageName = "jest-get-type";
|
||||
version = "27.4.0";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz";
|
||||
sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==";
|
||||
url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz";
|
||||
sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==";
|
||||
};
|
||||
};
|
||||
"jest-matcher-utils-27.4.6" = {
|
||||
"jest-matcher-utils-27.5.1" = {
|
||||
name = "jest-matcher-utils";
|
||||
packageName = "jest-matcher-utils";
|
||||
version = "27.4.6";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz";
|
||||
sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==";
|
||||
url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz";
|
||||
sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==";
|
||||
};
|
||||
};
|
||||
"jest-message-util-27.4.6" = {
|
||||
"jest-message-util-27.5.1" = {
|
||||
name = "jest-message-util";
|
||||
packageName = "jest-message-util";
|
||||
version = "27.4.6";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz";
|
||||
sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==";
|
||||
url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz";
|
||||
sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==";
|
||||
};
|
||||
};
|
||||
"js-tokens-4.0.0" = {
|
||||
|
|
@ -2290,6 +2308,15 @@ let
|
|||
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
|
||||
};
|
||||
};
|
||||
"minimatch-3.1.2" = {
|
||||
name = "minimatch";
|
||||
packageName = "minimatch";
|
||||
version = "3.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz";
|
||||
sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
|
||||
};
|
||||
};
|
||||
"minimist-1.2.5" = {
|
||||
name = "minimist";
|
||||
packageName = "minimist";
|
||||
|
|
@ -2317,13 +2344,13 @@ let
|
|||
sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
|
||||
};
|
||||
};
|
||||
"mocha-9.2.0" = {
|
||||
"mocha-9.2.1" = {
|
||||
name = "mocha";
|
||||
packageName = "mocha";
|
||||
version = "9.2.0";
|
||||
version = "9.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz";
|
||||
sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==";
|
||||
url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz";
|
||||
sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==";
|
||||
};
|
||||
};
|
||||
"moo-0.5.1" = {
|
||||
|
|
@ -2380,6 +2407,15 @@ let
|
|||
sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==";
|
||||
};
|
||||
};
|
||||
"nanoid-3.3.1" = {
|
||||
name = "nanoid";
|
||||
packageName = "nanoid";
|
||||
version = "3.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz";
|
||||
sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
|
||||
};
|
||||
};
|
||||
"natural-compare-1.4.0" = {
|
||||
name = "natural-compare";
|
||||
packageName = "natural-compare";
|
||||
|
|
@ -2398,13 +2434,13 @@ let
|
|||
sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==";
|
||||
};
|
||||
};
|
||||
"negotiator-0.6.2" = {
|
||||
"negotiator-0.6.3" = {
|
||||
name = "negotiator";
|
||||
packageName = "negotiator";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
|
||||
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
|
||||
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
|
||||
sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
|
||||
};
|
||||
};
|
||||
"normalize-path-3.0.0" = {
|
||||
|
|
@ -2650,13 +2686,13 @@ let
|
|||
sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
|
||||
};
|
||||
};
|
||||
"pretty-format-27.4.6" = {
|
||||
"pretty-format-27.5.1" = {
|
||||
name = "pretty-format";
|
||||
packageName = "pretty-format";
|
||||
version = "27.4.6";
|
||||
version = "27.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz";
|
||||
sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==";
|
||||
url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz";
|
||||
sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==";
|
||||
};
|
||||
};
|
||||
"progress-2.0.3" = {
|
||||
|
|
@ -2713,13 +2749,13 @@ let
|
|||
sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
|
||||
};
|
||||
};
|
||||
"qs-6.9.6" = {
|
||||
"qs-6.9.7" = {
|
||||
name = "qs";
|
||||
packageName = "qs";
|
||||
version = "6.9.6";
|
||||
version = "6.9.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
|
||||
sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
|
||||
url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz";
|
||||
sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==";
|
||||
};
|
||||
};
|
||||
"railroad-diagrams-1.0.0" = {
|
||||
|
|
@ -2758,13 +2794,13 @@ let
|
|||
sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
|
||||
};
|
||||
};
|
||||
"raw-body-2.4.2" = {
|
||||
"raw-body-2.4.3" = {
|
||||
name = "raw-body";
|
||||
packageName = "raw-body";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz";
|
||||
sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==";
|
||||
url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz";
|
||||
sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
|
||||
};
|
||||
};
|
||||
"react-is-17.0.2" = {
|
||||
|
|
@ -2902,13 +2938,13 @@ let
|
|||
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
|
||||
};
|
||||
};
|
||||
"sanitize-html-2.6.1" = {
|
||||
"sanitize-html-2.7.0" = {
|
||||
name = "sanitize-html";
|
||||
packageName = "sanitize-html";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.6.1.tgz";
|
||||
sha512 = "DzjSz3H5qDntD7s1TcWCSoRPmNR8UmA+y+xZQOvWgjATe2Br9ZW73+vD3Pj6Snrg0RuEuJdXgrKvnYuiuixRkA==";
|
||||
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz";
|
||||
sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==";
|
||||
};
|
||||
};
|
||||
"saxes-5.0.1" = {
|
||||
|
|
@ -3559,13 +3595,13 @@ let
|
|||
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
|
||||
};
|
||||
};
|
||||
"ws-7.5.6" = {
|
||||
"ws-7.5.7" = {
|
||||
name = "ws";
|
||||
packageName = "ws";
|
||||
version = "7.5.6";
|
||||
version = "7.5.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz";
|
||||
sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==";
|
||||
url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz";
|
||||
sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==";
|
||||
};
|
||||
};
|
||||
"xml-name-validator-3.0.0" = {
|
||||
|
|
@ -3662,8 +3698,8 @@ let
|
|||
args = {
|
||||
name = "mjolnir";
|
||||
packageName = "mjolnir";
|
||||
version = "1.3.1";
|
||||
src = ../../../../../../../nix/store/k1myvl4f3yvjk9jw4d1b1k1rc8rlwcy2-source;
|
||||
version = "1.3.2";
|
||||
src = ../../../../../../../nix/store/yikp7bs3z15vp8rpaghdqc9kpngsfvyj-source;
|
||||
dependencies = [
|
||||
sources."@babel/code-frame-7.12.11"
|
||||
sources."@babel/helper-validator-identifier-7.16.7"
|
||||
|
|
@ -3693,14 +3729,16 @@ let
|
|||
];
|
||||
})
|
||||
sources."@humanwhocodes/object-schema-1.2.1"
|
||||
sources."@jest/types-27.4.2"
|
||||
sources."@jest/types-27.5.1"
|
||||
sources."@selderee/plugin-htmlparser2-0.6.0"
|
||||
sources."@tootallnate/once-1.1.2"
|
||||
sources."@types/body-parser-1.19.2"
|
||||
sources."@types/config-0.0.41"
|
||||
sources."@types/connect-3.4.35"
|
||||
sources."@types/crypto-js-4.1.0"
|
||||
sources."@types/crypto-js-4.1.1"
|
||||
sources."@types/express-4.17.13"
|
||||
sources."@types/express-serve-static-core-4.17.28"
|
||||
sources."@types/html-to-text-8.0.1"
|
||||
sources."@types/istanbul-lib-coverage-2.0.4"
|
||||
sources."@types/istanbul-lib-report-3.0.0"
|
||||
sources."@types/istanbul-reports-3.0.1"
|
||||
|
|
@ -3708,7 +3746,7 @@ let
|
|||
sources."@types/json5-0.0.29"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/mocha-9.1.0"
|
||||
sources."@types/node-16.11.22"
|
||||
sources."@types/node-16.11.25"
|
||||
sources."@types/parse5-6.0.3"
|
||||
sources."@types/qs-6.9.7"
|
||||
sources."@types/range-parser-1.2.4"
|
||||
|
|
@ -3719,7 +3757,7 @@ let
|
|||
sources."@types/yargs-parser-20.2.1"
|
||||
sources."@ungap/promise-all-settled-1.1.2"
|
||||
sources."abab-2.0.5"
|
||||
sources."accepts-1.3.7"
|
||||
sources."accepts-1.3.8"
|
||||
sources."acorn-8.7.0"
|
||||
(sources."acorn-globals-6.0.0" // {
|
||||
dependencies = [
|
||||
|
|
@ -3757,14 +3795,14 @@ let
|
|||
sources."bcrypt-pbkdf-1.0.2"
|
||||
sources."binary-extensions-2.2.0"
|
||||
sources."bluebird-3.7.2"
|
||||
sources."body-parser-1.19.1"
|
||||
sources."body-parser-1.19.2"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."braces-3.0.2"
|
||||
sources."browser-process-hrtime-1.0.0"
|
||||
sources."browser-stdout-1.3.1"
|
||||
sources."buffer-from-1.1.2"
|
||||
sources."builtin-modules-1.1.1"
|
||||
sources."bytes-3.1.1"
|
||||
sources."bytes-3.1.2"
|
||||
sources."callsites-3.1.0"
|
||||
sources."camelcase-6.3.0"
|
||||
sources."caseless-0.12.0"
|
||||
|
|
@ -3780,7 +3818,7 @@ let
|
|||
sources."config-3.3.7"
|
||||
sources."content-disposition-0.5.4"
|
||||
sources."content-type-1.0.4"
|
||||
sources."cookie-0.4.1"
|
||||
sources."cookie-0.4.2"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."cross-spawn-7.0.3"
|
||||
|
|
@ -3802,7 +3840,7 @@ let
|
|||
sources."depd-1.1.2"
|
||||
sources."destroy-1.0.4"
|
||||
sources."diff-5.0.0"
|
||||
sources."diff-sequences-27.4.0"
|
||||
sources."diff-sequences-27.5.1"
|
||||
sources."discontinuous-range-1.0.0"
|
||||
sources."doctrine-3.0.0"
|
||||
sources."dom-serializer-1.3.2"
|
||||
|
|
@ -3866,8 +3904,8 @@ let
|
|||
sources."estraverse-5.3.0"
|
||||
sources."esutils-2.0.3"
|
||||
sources."etag-1.8.1"
|
||||
sources."expect-27.4.6"
|
||||
sources."express-4.17.2"
|
||||
sources."expect-27.5.1"
|
||||
sources."express-4.17.3"
|
||||
sources."extend-3.0.2"
|
||||
sources."extsprintf-1.3.0"
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
|
|
@ -3893,7 +3931,7 @@ let
|
|||
sources."glob-7.2.0"
|
||||
sources."glob-parent-5.1.2"
|
||||
sources."glob-to-regexp-0.4.1"
|
||||
sources."globals-13.12.0"
|
||||
sources."globals-13.12.1"
|
||||
sources."graceful-fs-4.2.9"
|
||||
sources."growl-1.10.5"
|
||||
sources."har-schema-2.0.0"
|
||||
|
|
@ -3941,10 +3979,10 @@ let
|
|||
sources."is-unicode-supported-0.1.0"
|
||||
sources."isexe-2.0.0"
|
||||
sources."isstream-0.1.2"
|
||||
sources."jest-diff-27.4.6"
|
||||
sources."jest-get-type-27.4.0"
|
||||
sources."jest-matcher-utils-27.4.6"
|
||||
(sources."jest-message-util-27.4.6" // {
|
||||
sources."jest-diff-27.5.1"
|
||||
sources."jest-get-type-27.5.1"
|
||||
sources."jest-matcher-utils-27.5.1"
|
||||
(sources."jest-message-util-27.5.1" // {
|
||||
dependencies = [
|
||||
sources."@babel/code-frame-7.16.7"
|
||||
];
|
||||
|
|
@ -3983,17 +4021,19 @@ let
|
|||
sources."mime-db-1.51.0"
|
||||
sources."mime-types-2.1.34"
|
||||
sources."minimalistic-assert-1.0.1"
|
||||
sources."minimatch-3.0.4"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.5"
|
||||
sources."mkdirp-1.0.4"
|
||||
(sources."mocha-9.2.0" // {
|
||||
(sources."mocha-9.2.1" // {
|
||||
dependencies = [
|
||||
(sources."debug-4.3.3" // {
|
||||
dependencies = [
|
||||
sources."ms-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."minimatch-3.0.4"
|
||||
sources."ms-2.1.3"
|
||||
sources."nanoid-3.2.0"
|
||||
sources."supports-color-8.1.1"
|
||||
];
|
||||
})
|
||||
|
|
@ -4004,10 +4044,10 @@ let
|
|||
];
|
||||
})
|
||||
sources."ms-2.0.0"
|
||||
sources."nanoid-3.2.0"
|
||||
sources."nanoid-3.3.1"
|
||||
sources."natural-compare-1.4.0"
|
||||
sources."nearley-2.20.1"
|
||||
sources."negotiator-0.6.2"
|
||||
sources."negotiator-0.6.3"
|
||||
sources."normalize-path-3.0.0"
|
||||
sources."nwsapi-2.2.0"
|
||||
sources."oauth-sign-0.9.0"
|
||||
|
|
@ -4033,7 +4073,7 @@ let
|
|||
sources."pify-3.0.0"
|
||||
sources."postcss-8.4.6"
|
||||
sources."prelude-ls-1.1.2"
|
||||
(sources."pretty-format-27.4.6" // {
|
||||
(sources."pretty-format-27.5.1" // {
|
||||
dependencies = [
|
||||
sources."ansi-styles-5.2.0"
|
||||
];
|
||||
|
|
@ -4043,12 +4083,12 @@ let
|
|||
sources."pseudomap-1.0.2"
|
||||
sources."psl-1.8.0"
|
||||
sources."punycode-2.1.1"
|
||||
sources."qs-6.9.6"
|
||||
sources."qs-6.9.7"
|
||||
sources."railroad-diagrams-1.0.0"
|
||||
sources."randexp-0.4.6"
|
||||
sources."randombytes-2.1.0"
|
||||
sources."range-parser-1.2.1"
|
||||
sources."raw-body-2.4.2"
|
||||
sources."raw-body-2.4.3"
|
||||
sources."react-is-17.0.2"
|
||||
sources."readdirp-3.6.0"
|
||||
sources."regexpp-3.2.0"
|
||||
|
|
@ -4073,7 +4113,7 @@ let
|
|||
sources."rimraf-3.0.2"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."sanitize-html-2.6.1"
|
||||
sources."sanitize-html-2.7.0"
|
||||
sources."saxes-5.0.1"
|
||||
sources."selderee-0.6.0"
|
||||
sources."semver-7.3.5"
|
||||
|
|
@ -4112,7 +4152,7 @@ let
|
|||
sources."symbol-tree-3.2.4"
|
||||
(sources."table-6.8.0" // {
|
||||
dependencies = [
|
||||
sources."ajv-8.9.0"
|
||||
sources."ajv-8.10.0"
|
||||
sources."json-schema-traverse-1.0.0"
|
||||
];
|
||||
})
|
||||
|
|
@ -4177,7 +4217,7 @@ let
|
|||
sources."workerpool-6.2.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."ws-7.5.6"
|
||||
sources."ws-7.5.7"
|
||||
sources."xml-name-validator-3.0.0"
|
||||
sources."xmlchars-2.2.0"
|
||||
sources."y18n-5.0.8"
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2";
|
||||
sha256 = "sha256-GKn8JRgYXLkm5gX5Tv6lMdS7oFan2TF7dLqWK+nEeYg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx";
|
||||
cargoSha256 = "sha256-r3Np9aAJRZUj0TezZhT5cJJkm8EBjV9yQpplcrNgzmU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.85.0";
|
||||
version = "0.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gkwFW9ikpdA5ErNGmkMMTRvWmRVw28vZF/SixsWnzNg=";
|
||||
sha256 = "sha256-AvBfj3/dPq/iokuRBDQRh2b3g5KBH/oFBDEDaVwQ51A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-as3Q8umRES/XncIZbV4UKZSGvzqHF7ClKBWvnGdkYeg=";
|
||||
vendorSha256 = "sha256-bqyT6RXPBDPZt9ogS97G0jHJs7VdvVlHCXMaqJjnU2s=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FNlbAxU1FiLl74h+BmpAB3+vZ+RgdlpkehsDLhpZ4EE=";
|
||||
sha256 = "sha256-US3Wvr6uBwsaIqjsbWeZtYucXVybMjKu8AuPYvykCvA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o=";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lfs";
|
||||
version = "2.2.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q8ekLh0pw+kMIE2SP3cBgrMTfMjY5zRWR58mq5bbB8U=";
|
||||
sha256 = "sha256-ySaPR6it/1xEf+Rnypnz5AklxWZZ8NeXpjId4ZSMIs8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eZM48OyYgEJl71I2iu52hKwjDrbSelR4JH/se79bBDs=";
|
||||
cargoSha256 = "sha256-FLbFDJXVpWycII8mdNDphh8QVXFFnxtFgloweW+BZA0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get information on your mounted disks";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtools";
|
||||
version = "4.0.37";
|
||||
version = "4.0.38";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-eZsZfiPke2ElliiBCyd5Dvt6H+NgN+8dqKJ7CuT6g0I=";
|
||||
sha256 = "sha256-e5RIX0huffCMymiwChZKE8049MY8uGhNGIdZ7nvF5yk=";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
|
||||
|
|
|
|||
|
|
@ -1,44 +1,55 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, gobject-introspection
|
||||
, pango
|
||||
, gtksourceview4
|
||||
, wrapGAppsHook
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, gobject-introspection
|
||||
, poetry-core
|
||||
, wrapGAppsHook
|
||||
, gtksourceview4
|
||||
, pango
|
||||
, gaphas
|
||||
, generic
|
||||
, jedi
|
||||
, pycairo
|
||||
, pygobject3
|
||||
, python
|
||||
, tinycss2
|
||||
, gtk3
|
||||
, librsvg
|
||||
, makeDesktopItem
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gaphor";
|
||||
version = "2.6.5";
|
||||
version = "2.8.2";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IFsbWx5lblKsnEibVihM6ZPRoydXC+JM1gdZEUUTKxw=";
|
||||
sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core copyDesktopItems gobject-introspection wrapGAppsHook
|
||||
copyDesktopItems
|
||||
gobject-introspection
|
||||
poetry-core
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
# Setting gobject-introspection on booth nativeBuildInputs and
|
||||
# buildInputs because of #56943. This recognizes pango, avoiding
|
||||
# a "ValueError: Namespace PangoCairo not available".
|
||||
buildInputs = [ gobject-introspection gtksourceview4 pango ];
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtksourceview4
|
||||
pango
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gaphas
|
||||
generic
|
||||
jedi
|
||||
pycairo
|
||||
pygobject3
|
||||
tinycss2
|
||||
|
|
@ -52,10 +63,20 @@ buildPythonApplication rec {
|
|||
desktopName = "Gaphor";
|
||||
};
|
||||
|
||||
# We need to wrap it manually to resolve all icons
|
||||
dontWrapGApps = true;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/gaphor \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple modeling tool written in Python";
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyperfine";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Vs754nvtYV5d736xsZ2foawfxMc25bUfMhm8Vxqxw6U=";
|
||||
sha256 = "sha256-1TWaLw1JxUE8RjPVVTldCbMSArNb+uhXM865iuJaJUo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-X9WFnKP2+GM8V1kyd5VxpwBXql8Be5mugBVGrYdSsaM=";
|
||||
cargoSha256 = "sha256-kzDjxWMXie6qjherzdXvHxrS4i8FAXcKiuk/+wbMkAA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nncp";
|
||||
version = "8.6.0";
|
||||
version = "8.7.0";
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-rhbwoJwbfR2jdn4cD0ENnCmsyuYypEipVdtKDxW/g48=";
|
||||
sha256 = "sha256-7UiP/X2IAovdZDhr7ErZEW99oIgfseYoST0vK7vR6Gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go redo-apenwarr ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brook";
|
||||
version = "20220401";
|
||||
version = "20220404";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "txthinking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-H6lH4LG7MhxQsGVs3CSVX9FEywONDrS5bsjzw5b5k/U=";
|
||||
sha256 = "sha256-yQuGaj5HukO+OENCpVMkoXv2AztygjrDPXgHaVBFyZ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3ndpmERtaLHuTMMUcq+OenBxgW3+qy/bZCiWRgI0L84=";
|
||||
vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/txthinking/brook";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffglue";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kpcyrd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s+2YzfSy7+o0VZZ4j/Cfd6F5GvBytthmDJqrPw+7SU0=";
|
||||
sha256 = "sha256-8SkwdPaKHf0ZE/MeM4yOe2CpQvZzIHf5d06iM7KPAT8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4G1OGY7/vE8NKBFeuOZzqyZ0DQN4hy/HBO9qrEtBYlM=";
|
||||
cargoSha256 = "sha256-UGvFLW48sakNuV3eXBpCxaHOrveQPXkynOayMK6qs4g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgpdump";
|
||||
version = "0.34";
|
||||
version = "0.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazu-yamamoto";
|
||||
repo = "pgpdump";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vvxhbz8nqzw9gf7cdmas2shzziznsqj84w6w74h8zzgb4m3byzz";
|
||||
sha256 = "sha256-GjPy/feF437WtDqbEn1lGwWayWtvKhqsyJFMuH3IFl4=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ];
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btop";
|
||||
version = "1.2.4";
|
||||
hash = "sha256-IFuDpqRtsim2dfSTODuNK62xaLvKKcB5YBNHSQI6q44=";
|
||||
version = "1.2.5";
|
||||
hash = "sha256-W7DTaJVA9xqdgBjrrR+OK1buBMrjpw2T0I//ZZKQFOw=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
|
|
|
|||
|
|
@ -4424,6 +4424,8 @@ with pkgs;
|
|||
|
||||
brotli = callPackage ../tools/compression/brotli { };
|
||||
|
||||
biodiff = callPackage ../development/tools/biodiff { };
|
||||
|
||||
biosdevname = callPackage ../tools/networking/biosdevname { };
|
||||
|
||||
bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
|
||||
|
|
@ -25797,6 +25799,7 @@ with pkgs;
|
|||
};
|
||||
wireshark-qt = wireshark;
|
||||
|
||||
tshark = wireshark-cli;
|
||||
wireshark-cli = wireshark.override {
|
||||
withQt = false;
|
||||
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue