Merge master into staging-next
This commit is contained in:
commit
858a718b87
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20220125";
|
||||
version = "20220506";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM=";
|
||||
sha256 = "sha256-fK0FBn9e7l1Y/A7taFlaoas6ZPREFhEmskVBqjda6q0=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
|
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.1.2.2";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6YsA6tC94yJuuWp5rXXqHzqRy28tvmJzjOR92YwQYO0=";
|
||||
hash = "sha256-Uo403vxzmDntmdoQZQqncuLpDXVJ2FdGi4pQ9jE9b/k=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "sigil";
|
||||
version = "1.9.2";
|
||||
version = "1.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "Sigil";
|
||||
owner = "Sigil-Ebook";
|
||||
rev = version;
|
||||
sha256 = "sha256-LfP3qUzoHuYSpkTz1queVGTWOP9v9kbgbgvvtiMK6Eo=";
|
||||
sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [ lxml ];
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "edgetx";
|
||||
version = "2.6.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdgeTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-TffHFgr3g7v4VnNSSlLITz4cYjHM6wE0aI85W1g4IFA=";
|
||||
sha256 = "sha256-1l5EoDY17+2PDS3eRT3CHksVoZQgNLV9vRDu7nfzlrE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pure-maps";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "pure-maps";
|
||||
rev = version;
|
||||
hash = "sha256-r36/Vpt4ZIWV1+VhqRBuo4uT7nmEGiFGIt3QGG3ijjs=";
|
||||
hash = "sha256-PjZ8aKF+g3mH7z6LIUxI7mbtkcFv3wznBywaX/Y+1FU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "qdirstat";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shundhammer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-R/eUqv5AxO5TcLkqOvlAXEkjAzeKGihf8YIQIIevOR0=";
|
||||
sha256 = "sha256-yWv41iWtdTdlFuvLHKCbwmnSXq7Z5pIJq28GMDltdxM=";
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ=";
|
||||
sha256 = "sha256-zGk5Bo1n2VV33wzozgYWbrwd/D3lcSWsqb+s3U3kmus=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc=";
|
||||
vendorSha256 = "sha256-l8srlzoCcBZFOwVs7veQ1RvqWRIqQAaZLM/2CbNHN50=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.4.1";
|
||||
version = "4.4.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -41,7 +41,7 @@ mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BBOTyKMZikkxMJSmzAuChVHpVeCvbAimn1K3REGbqEg=";
|
||||
sha256 = "sha256-o/IyUvIthCrka6oTa0xMKg0sDj4zdon3kBr2gJ2Id8w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.26.11";
|
||||
version = "2.27.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "sha256-0swggo1a5gExpj3VgaWKT/TYd7rfSFBcqRrAURnTPjM=";
|
||||
sha256 = "sha256-H52iduXuZXkH7i+1qGq05DTPgLGZD2ke6US5nTzmvDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -3,10 +3,10 @@
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, libepoxy
|
||||
, glib
|
||||
, gtk4
|
||||
, wayland
|
||||
, libepoxy
|
||||
, libadwaita
|
||||
, meson
|
||||
, mpv
|
||||
, ninja
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "celluloid";
|
||||
version = "0.23";
|
||||
version = "0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celluloid-player";
|
||||
repo = "celluloid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YKDud/UJJx9ko5k+Oux8mUUme0MXaRMngESE14Hhxv8=";
|
||||
hash = "sha256-8Y/dCeoS29R1UHwmLOp0d+JNNC4JH5pLpiqfBZU+kLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,11 +36,12 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libepoxy
|
||||
glib
|
||||
gtk4
|
||||
wayland
|
||||
libadwaita
|
||||
libepoxy
|
||||
mpv
|
||||
];
|
||||
|
||||
@ -50,6 +51,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/celluloid-player/celluloid";
|
||||
description = "Simple GTK frontend for the mpv video player";
|
||||
@ -62,8 +67,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
}
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.24.1";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HUiz1t5wxUPR2elxE1Q5/BwRnkHgzej2HsrZnFbhHhA=";
|
||||
sha256 = "sha256-7TYrmoC1opZklWO8Z1MK5XlwM635qsPBw3M3WQFhT4c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub
|
||||
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
|
||||
{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub
|
||||
, graphicsmagick, libav, pcre, xorgserver, ffmpeg
|
||||
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
|
||||
, callPackage
|
||||
}: let
|
||||
@ -12,6 +12,10 @@
|
||||
};
|
||||
in {
|
||||
|
||||
softhddevice = callPackage ./softhddevice {};
|
||||
|
||||
streamdev = callPackage ./streamdev {};
|
||||
|
||||
xineliboutput = callPackage ./xineliboutput {};
|
||||
|
||||
skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: {
|
||||
@ -47,57 +51,21 @@ in {
|
||||
|
||||
};
|
||||
|
||||
vaapidevice = stdenv.mkDerivation {
|
||||
pname = "vdr-vaapidevice";
|
||||
version = "20190525";
|
||||
|
||||
buildInputs = [
|
||||
vdr libxcb xcbutilwm ffmpeg
|
||||
alsa-lib
|
||||
libvdpau # vdpau
|
||||
libva # va-api
|
||||
] ++ (with xorg; [ libxcb libX11 ]);
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X
|
||||
# https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5
|
||||
substituteInPlace Makefile --replace libva libva-x11
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pesintta";
|
||||
repo = "vdr-plugin-vaapidevice";
|
||||
sha256 = "1gwjp15kjki9x5742fhaqk3yc2bbma74yp2vpn6wk6kj46nbnwp6";
|
||||
rev = "d19657bae399e79df107e316ca40922d21393f80";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pesintta/vdr-plugin-vaapidevice";
|
||||
description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
markad = stdenv.mkDerivation rec {
|
||||
pname = "vdr-markad";
|
||||
version = "unstable-2017-03-13";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
|
||||
sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4";
|
||||
rev = "ea2e182ec798375f3830f8b794e7408576f139ad";
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-markad";
|
||||
owner = "jbrundiers";
|
||||
sha256 = "sha256-Y4KsEtUq+KoUooXiw9O9RokBxNwWBkiGB31GncmHkYM=";
|
||||
rev = "288e3dae93421b0176f4f62b68ea4b39d98e8793";
|
||||
};
|
||||
|
||||
buildInputs = [ vdr libav ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)'
|
||||
substituteInPlace command/Makefile --replace '/usr' ""
|
||||
|
||||
substituteInPlace plugin/markad.cpp \
|
||||
--replace "/usr/bin" "$out/bin" \
|
||||
@ -107,22 +75,19 @@ in {
|
||||
--replace "/var/lib/markad" "$out/var/lib/markad"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/lib/vdr
|
||||
'';
|
||||
|
||||
buildFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"LIBDIR=$(out)/lib/vdr"
|
||||
"LIBDIR=/lib/vdr"
|
||||
"APIVERSION=${vdr.version}"
|
||||
"VDRDIR=${vdr.dev}/include/vdr"
|
||||
"LOCALEDIR=$(DESTDIR)/share/locale"
|
||||
"LOCDIR=/share/locale"
|
||||
];
|
||||
|
||||
installFlags = buildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://projects.vdr-developer.org/projects/plg-markad";
|
||||
description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung.";
|
||||
homepage = "https://github.com/jbrundiers/vdr-plugin-markad";
|
||||
description = "MarkAd marks advertisements in VDR recordings.";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
|
50
pkgs/applications/video/vdr/softhddevice/default.nix
Normal file
50
pkgs/applications/video/vdr/softhddevice/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, vdr
|
||||
, alsa-lib
|
||||
, fetchFromGitHub
|
||||
, xcbutilwm
|
||||
, xorgserver
|
||||
, ffmpeg
|
||||
, libva
|
||||
, libvdpau
|
||||
, xorg
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
vdr
|
||||
xcbutilwm
|
||||
ffmpeg
|
||||
alsa-lib
|
||||
libva
|
||||
libvdpau
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace softhddev.c \
|
||||
--replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice";
|
||||
description = "VDR SoftHDDevice Plug-in";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
||||
}
|
39
pkgs/applications/video/vdr/streamdev/default.nix
Normal file
39
pkgs/applications/video/vdr/streamdev/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, vdr
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-streamdev";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vdr-projects";
|
||||
repo = "vdr-plugin-streamdev";
|
||||
rev = version;
|
||||
sha256 = "sha256-12sASyFAnSuP2xQzr1KL/Am52ez6hiOUH/0zFH2bxhc=";
|
||||
};
|
||||
|
||||
# configure don't accept argument --prefix
|
||||
dontAddPrefix = true;
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"LIBDIR=/lib/vdr"
|
||||
"LOCDIR=/share/locale"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
vdr
|
||||
];
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev";
|
||||
description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol.";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
inherit (vdr.meta) platforms;
|
||||
};
|
||||
}
|
36
pkgs/applications/virtualization/ops/default.nix
Normal file
36
pkgs/applications/virtualization/ops/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ops";
|
||||
version = "0.1.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanovms";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ac+17hywzyK7ChCP/nhwTP1WEIZ89+BKX9/YmsPpfg8=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # Doesn't build otherwise
|
||||
|
||||
vendorSha256 = "sha256-65VvUy4vGTfZgsXGJVSc/yU5R5MhSKJyMMsvPOCThks=";
|
||||
|
||||
# Some tests fail
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/nanovms/ops/lepton.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build and run nanos unikernels";
|
||||
homepage = "https://github.com/nanovms/ops";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virt-what";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-C9fllw/y1SwJKIEa4mgnlYQjF/7L5VN0z84EI88uS9Y=";
|
||||
sha256 = "sha256-1Py0I2Irr75eK7zYS32SrU1YP0d4siW3LEqBrp/Dxz0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -10,13 +10,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "souffle";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "souffle-lang";
|
||||
repo = "souffle";
|
||||
rev = version;
|
||||
sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU=";
|
||||
sha256 = "sha256-wdTBSmyA2I+gaSV577NNKA2oY2fdVTGmvV7h15NY1tU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ];
|
||||
|
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.12.1";
|
||||
version = "2.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0qXRYWXKC17JiL1D+jjuGVoOGAJuGbJje7OZyd2k3o8=";
|
||||
hash = "sha256-MuKmmlPRcB/EYW6AD7Pa/4G7rYAYMqe/Vj47Ycn+Pf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,19 +1,27 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathvalidate";
|
||||
version = "2.5.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "2.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-u8J+ZTM1q6eTWireIpliLnapSHvJAEzc8UQc6NL/SlQ=";
|
||||
hash = "sha256-X/V9D6vl7Lek8eSVe/61rYq1q0wPpx95xrvCS9m30U0=";
|
||||
};
|
||||
|
||||
# Requires `pytest-md-report`, causing infinite recursion.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pathvalidate" ];
|
||||
pythonImportsCheck = [
|
||||
"pathvalidate"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc";
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.18.12";
|
||||
version = "0.18.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9eg66+LbUr2px5jVcEopC5UIwZZU51bicDn8lMuDR6U=";
|
||||
hash = "sha256-XUdrjhV0AnKV6snb183FrlcSLAvo7U+NyvPDorykkJU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "1.6.2";
|
||||
version = "1.6.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U63SuHUs7xaxv3qkI36NhB6nkSE8/NVzKPckHvkgZZw=";
|
||||
hash = "sha256-aE8JrGNfsNeJdpoKzyxd/ixYO1WSKCPgXpiV0+HQOcI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgweb";
|
||||
version = "0.11.11";
|
||||
version = "0.11.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sosedoff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oKUmBrGxExppJ5y4fZOmMOT5XDMsyMvtE9czotdlMPM=";
|
||||
sha256 = "sha256-5BFTvfTXsz5ZerSoAudavT/C+SA/xkmVBtAOhAixcAE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
rm -f pkg/client/{client,dump}_test.go
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-Svy0aZKOGL0vrT058szlpS5t7NvzcyRCHRksdmdkckI=";
|
||||
vendorSha256 = "sha256-pXV1BodOEZs5sv7UE/C58SAyIUZW5Cp2gJD7g8EuWog=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -2,19 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pqrs";
|
||||
version = "0.1.1";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manojkarthick";
|
||||
repo = "pqrs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vx952ki1rhwfmr3faxs363m9fh61b37b0bkbs57ggn9r44sk1z2";
|
||||
sha256 = "sha256-/PNGqveN4BSkURFVUpNgHDcPtz9vFhzdY8UK00AMaks=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0mjwazsnryhlfyzcik8052q0imz5f104x86k6b5rncbbbjaj17q1";
|
||||
cargoSha256 = "sha256-3mrNS0zNgsG7mX3RileFLi5iw3SrlEQC96FSANjpKT8=";
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # since 2021-07-05 on hydra
|
||||
description = "CLI tool to inspect Parquet files";
|
||||
homepage = "https://github.com/manojkarthick/pqrs";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pulumictl";
|
||||
version = "0.0.30";
|
||||
version = "0.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "pulumictl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xAlc6dYD73JZqV0QDhvqPmtGF99mqhvdBbDhWlY/4PI=";
|
||||
sha256 = "sha256-CZ0DnQUnyj8aoesFymc+Uhv+3vdQhdxb2YHElAyqGWE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s=";
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valum";
|
||||
version = "0.3.16";
|
||||
version = "0.3.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valum-framework";
|
||||
repo = "valum";
|
||||
rev = "v${version}";
|
||||
sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f";
|
||||
sha256 = "sha256-GpzFtr6MueHGHA6BEc24oGSfjxyHxIlL52cq+0gmBAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtads";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "realnc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xMAGbOA+qtwMk5VT5yi//GDzTKtYfGku/Sm4l5smzEs=";
|
||||
sha256 = "sha256-CndN8l7GGIekfbz7OrTYIElL7SxRxEkiNiZP2NHuxOg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkquake";
|
||||
version = "1.13.0";
|
||||
version = "1.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Novum";
|
||||
repo = "vkQuake";
|
||||
rev = version;
|
||||
sha256 = "sha256-dRPeUsBLliBevjMOSMU+uPSAivrQ0tbuh4QeLmowrAI=";
|
||||
sha256 = "sha256-ocxXkayWujqAFV5N67VfmzJOUbjCPBZut9zmwNRYDeI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/Quake";
|
||||
|
@ -108,6 +108,10 @@ let
|
||||
prePatch = ''
|
||||
sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'
|
||||
|
||||
# fixup for pre-5.4 kernels using the $(cd $foo && /bin/pwd) pattern
|
||||
# FIXME: remove when no longer needed
|
||||
substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd
|
||||
|
||||
# Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic.
|
||||
# This way kernels can be bit-by-bit reproducible depending on settings
|
||||
# (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trace-cmd";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
|
||||
rev = "trace-cmd-v${version}";
|
||||
sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q=";
|
||||
sha256 = "sha256-wxrMEE7ZgMHM59Rv6Gk3f0zdpULuXLnY0UY797YF1a0=";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
|
@ -2,14 +2,14 @@
|
||||
coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.4.17";
|
||||
version = "0.5.4.18";
|
||||
pname = "xarchiver";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ib";
|
||||
repo = "xarchiver";
|
||||
rev = version;
|
||||
sha256 = "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v";
|
||||
sha256 = "sha256-WBHsUMI4xl1P17aBTuxxyGOhQzOnd8ZhS/ped8nXMLA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "s3ql";
|
||||
version = "3.8.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "0kk8jjb9zir4wfxv4zsa4ysj77322l73vddcx4y6czjq1j9jz9f2";
|
||||
rev = "refs/tags/release-${version}";
|
||||
sha256 = "sha256-7N09b7JwMPliuyv2fEy1gQYaFCMSSvajOBPhNL3DQsg=";
|
||||
};
|
||||
|
||||
checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]);
|
||||
|
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dvdisaster";
|
||||
version = "0.79.9";
|
||||
version = "0.79.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dvdisaster.jcea.es/downloads/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-eclOJ33pS2aP4F7RUHc84ynpH7sTv2dsO4vn5vB248M=";
|
||||
hash = "sha256-3Qqf9i8aSL9z2uJvm8P/QOPp83nODC3fyLL1iBIgf+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext pkg-config which ];
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fend";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "printfn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6zYz6DMnYSGyDXqP5K8bKauy23YA2tzBmGk72f5+bgY=";
|
||||
sha256 = "sha256-y5r9/e3KbEojRIoGG9gBkVbxGrJJJhwVZiiTkpy4NtE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ydt2YGx5WWk42Vq4RXhiRf6kIne7Q/6XwIu+HEnhDVw=";
|
||||
cargoSha256 = "sha256-iv3Uo3XUAxf+CmiRBm8EzQ2GhglPVqbN/LSofTa6ujw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lesspipe";
|
||||
version = "2.05";
|
||||
version = "2.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wofr06";
|
||||
repo = "lesspipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mRgOndoDpyMnlj/BIoqwpZzuth4eA6yoB2VFZOigRw4=";
|
||||
sha256 = "sha256-4hyDtr2/9lhAWuiLd7OQ/+rdg/u5f5JT4hba3wpxxzg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl makeWrapper ];
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rauc";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc=";
|
||||
sha256 = "sha256-Cst+hSMyuJw6b+ZA6XNVh0kVp7WUTiiXpO1TPeHA+sM=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "viddy";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sachaos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+0Twa9OYIuyt1+F/sLkQSOj0u04r7y/DqYd11buquow=";
|
||||
sha256 = "sha256-AcRfKu6P7b/HsuC6DTezbYLI9rQZwjklH/bs7mKITUk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk=";
|
||||
vendorSha256 = "sha256-QxYM4N3E/BqmeNaofLR1crwFLVaF3IigDXKlKA2Bkuw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6";
|
||||
version = "3.8.1";
|
||||
pname = "kpcli";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
|
||||
sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1";
|
||||
sha256 = "sha256-bIT4Y5JFeZv5stXOKXxBtdTsB4n39fqeh2dVaBbqRyw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
29
pkgs/tools/security/websploit/default.nix
Normal file
29
pkgs/tools/security/websploit/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub
|
||||
, requests, scapy }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "websploit";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4rih";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
scapy
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high level MITM framework";
|
||||
homepage = "https://github.com/f4rih/websploit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
64
pkgs/tools/security/xsser/default.nix
Normal file
64
pkgs/tools/security/xsser/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook, gobject-introspection, gtk3, pango
|
||||
, pillow, pycurl, beautifulsoup4, pygeoip, pygobject3, cairocffi, selenium }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "xsser";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epsylon";
|
||||
repo = pname;
|
||||
rev = "478242e6d8e1ca921e0ba8fa59b50106fa2f7312";
|
||||
sha256 = "MsQu/r1C6uXawpuVTuBGhWNqCSZ9S2DIx15Lpo7L4RI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Replace relative path with absolute store path
|
||||
find . -type f -exec sed -i "s|core/fuzzing/user-agents.txt|$out/share/xsser/fuzzing/user-agents.txt|g" {} +
|
||||
|
||||
# Replace absolute path references with store paths
|
||||
substituteInPlace core/main.py --replace /usr $out
|
||||
substituteInPlace gtk/xsser.desktop --replace /usr $out
|
||||
substituteInPlace setup.py --replace /usr/share share
|
||||
'';
|
||||
|
||||
# Temporary fix
|
||||
# See https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
pango
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
pycurl
|
||||
beautifulsoup4
|
||||
pygeoip
|
||||
pygobject3
|
||||
cairocffi
|
||||
selenium
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D core/fuzzing/user-agents.txt $out/share/xsser/fuzzing/user-agents.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic framework to detect, exploit and report XSS vulnerabilities in web-based applications";
|
||||
homepage = "https://xsser.03c8.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
@ -3,6 +3,7 @@
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, enableMail ? false
|
||||
, gnused
|
||||
, mailutils
|
||||
, inetutils
|
||||
, IOKit
|
||||
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
cp -v ${driverdb} drivedb.h
|
||||
'';
|
||||
|
||||
configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ inetutils mailutils ]}";
|
||||
configureFlags = lib.optional enableMail "--with-scriptpath=${lib.makeBinPath [ gnused inetutils mailutils ]}";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruplacer";
|
||||
version = "0.6.4";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TankerHQ";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jLGstlEqABT4ejdYlTQZaBVeYy86+lqIilyufPGIZyQ=";
|
||||
sha256 = "sha256-1uukn1juFZB7lLZwGBmTc78h1p1GYhZxWMJqvpvIWpA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cv+g68WQvnnd0qZDB9PfZLbsdrM+RXs27a0Q5YPiHDQ=";
|
||||
cargoSha256 = "sha256-SeQ0E/8m6Rxg7oOHbNliVoc+Vh5Yb1E9/n8TJO2rY80=";
|
||||
|
||||
buildInputs = (lib.optional stdenv.isDarwin Security);
|
||||
|
||||
|
@ -23136,6 +23136,8 @@ with pkgs;
|
||||
tpmSupport = true;
|
||||
};
|
||||
|
||||
ops = callPackage ../applications/virtualization/ops { };
|
||||
|
||||
seabios = callPackage ../applications/virtualization/seabios { };
|
||||
|
||||
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
|
||||
@ -31563,6 +31565,8 @@ with pkgs;
|
||||
|
||||
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
|
||||
|
||||
websploit = python3Packages.callPackage ../tools/security/websploit {};
|
||||
|
||||
webssh = with python3Packages; toPythonApplication webssh;
|
||||
|
||||
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
|
||||
@ -36119,6 +36123,8 @@ with pkgs;
|
||||
sane-backends = sane-backends.override { libpng = libpng12; };
|
||||
};
|
||||
|
||||
xsser = python3Packages.callPackage ../tools/security/xsser { };
|
||||
|
||||
xsw = callPackage ../applications/misc/xsw {
|
||||
# Enable the next line to use this in terminal.
|
||||
# Note that it requires sixel capable terminals such as mlterm
|
||||
|
Loading…
Reference in New Issue
Block a user