Merge commit '5b6c2380adb4c4ddb0f87152cef0016333ea5a4d' into staging-fix

This commit is contained in:
Luke Granger-Brown 2021-09-07 16:21:36 +00:00
commit 9501e5d2fd
67 changed files with 936 additions and 530 deletions

View File

@ -1324,6 +1324,12 @@
githubId = 7346933;
name = "betaboon";
};
bew = {
email = "benoit.dechezelles@gmail.com";
github = "bew";
githubId = 9730330;
name = "Benoit de Chezelles";
};
bfortz = {
email = "bernard.fortz@gmail.com";
github = "bfortz";
@ -10278,6 +10284,12 @@
githubId = 8668915;
name = "Stephane Schitter";
};
staccato = {
name = "staccato";
email = "moveq@riseup.net";
github = "staccato";
githubId = 86573128;
};
steell = {
email = "steve@steellworks.com";
github = "Steell";

View File

@ -1143,6 +1143,16 @@ Superuser created successfully.
make the apps fit better visually.
</para>
</listitem>
<listitem>
<para>
<literal>rofi</literal> has been updated from
<quote>1.6.1</quote> to <quote>1.7.0</quote>, one important
thing is the removal of the old xresources based configuration
setup. Read more
<link xlink:href="https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1">in
rofis changelog</link>.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View File

@ -325,3 +325,5 @@ To be able to access the web UI this port needs to be opened in the firewall.
- The MariaDB C client library, also known as libmysqlclient or mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While this should hopefully not have any impact, this upgrade comes with some changes to default behavior, so you might want to review the [upstream release notes](https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/).
- GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually.
- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).

View File

@ -102,7 +102,12 @@ mkDerivation rec {
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
makeWrapper \
$out/app/server/ruby/bin/sonic-pi-server.rb \
$out/bin/sonic-pi-server \
--prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
'';

View File

@ -78,6 +78,31 @@
};
};
# may be part of MELPA in the future, see
# https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874
bqn-mode = self.trivialBuild {
pname = "bqn-mode";
version = "unstable-2021-09-04";
src = pkgs.fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9";
sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp";
};
postUnpack = ''
sourceRoot="$sourceRoot/editors/emacs"
'';
meta = {
description = "Emacs mode for BQN";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sternenseemann ];
homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
};
};
ghc-mod = melpaBuild {
pname = "ghc";
version = pkgs.haskellPackages.ghc-mod.version;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.87.0";
version = "0.88.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc=";
sha256 = "sha256-6dJ8H9oJwIW7rY2NrYVKuWDjwrFc9C30Vb0i20+opM0=";
};
vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU=";
vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8=";
doCheck = false;

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "notejot";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
hash = "sha256-OmzEwShIpzIbonqwQmpdutd3tztm7Gmmo3qdt+DApWo=";
hash = "sha256-Exg9HxV3cxySuT8ifVyZgoATQ/FAC8umj3smJ7W/5/Y=";
};
nativeBuildInputs = [

View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
let
appname = "SuperSlicer";
version = "2.3.56.5";
version = "2.3.56.8";
pname = "super-slicer";
description = "PrusaSlicer fork with more features and faster development cycle";
override = super: {
@ -10,13 +10,15 @@ let
src = fetchFromGitHub {
owner = "supermerill";
repo = "SuperSlicer";
sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E=";
sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo=";
rev = version;
fetchSubmodules = true;
};
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
postInstall = null;
dontStrip = true;
separateDebugInfo = true;
# See https://github.com/supermerill/SuperSlicer/issues/432
cmakeFlags = super.cmakeFlags ++ [

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "reddsaver";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv";
sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
};
cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z";
cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

View File

@ -1,16 +1,35 @@
{ stdenv, lib, fetchurl
, autoreconfHook, pkg-config, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, pkg-config
, libxkbcommon
, pango
, which
, git
, cairo
, libxcb
, xcbutil
, xcbutilwm
, xcbutilxrm
, xcb-util-cursor
, libstartup_notification
, bison
, flex
, librsvg
, check
}:
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz";
sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd";
src = fetchFromGitHub {
owner = "davatorium";
repo = "rofi";
rev = version;
fetchSubmodules = true;
sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v";
};
preConfigure = ''
@ -20,8 +39,22 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
buildInputs = [
libxkbcommon
pango
cairo
git
bison
flex
librsvg
check
libstartup_notification
libxcb
xcbutil
xcbutilwm
xcbutilxrm
xcb-util-cursor
which
];
doCheck = false;
@ -30,7 +63,7 @@ stdenv.mkDerivation rec {
description = "Window switcher, run dialog and dmenu replacement";
homepage = "https://github.com/davatorium/rofi";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ bew ];
platforms = with platforms; linux;
};
}

View File

@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.16.2";
version = "0.17.0";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p";
sha256 = "15ffb8damn935sfnqpshiyaazpldjcq411xrcfngpp7ncl9vbgwm";
stripRoot = false;
};
in
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA=";
sha256 = "1pw558d64c6ynqnnadhg8vbi4ql6f5y81l9hpxi0ki5myj2kx6an";
};
vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs=";
vendorSha256 = "sha256-FUASe7EQ8YVv3R6fPPLtsvMibe00Ox596GoTyKt0S+E=";
nativeBuildInputs = [ installShellFiles ];
@ -34,6 +34,10 @@ buildGoModule rec {
cp -r ${manifests} source/cmd/flux/manifests
'';
# Required to workaround test error:
# panic: mkdir /homeless-shelter: permission denied
HOME="$TMPDIR";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/flux --version | grep ${version} > /dev/null

View File

@ -24,14 +24,14 @@
stdenv.mkDerivation rec {
pname = "chatty";
version = "0.3.2";
version = "0.3.4";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = "chatty";
rev = "v${version}";
sha256 = "sha256-/l8hysfBmXLbs2COIVjdr2JC1qX/c66DqOm2Gyqb9s8=";
sha256 = "0910f5bw75ph576gxbsd6ysdwnlk4ysdp0pml2i3mjqpcbkqfs3w";
};
postPatch = ''

View File

@ -28,14 +28,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "3.2";
version = "3.2.1";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "0pck4lczkk52mgwa1n0habp1xqi9xsgsh5q6bbsjmdbandvy5vc8";
sha256 = "sha256-gtFskJoJLw7cqLao46LRUcZobOtzgwUOiKf7I4OiJAQ=";
};
patches = [

View File

@ -1,15 +1,17 @@
{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras
, qtwayland }:
{ mkDerivation, lib, stdenv, fetchurl
, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets
, qtx11extras, qtwayland
}:
mkDerivation rec {
pname = "qownnotes";
version = "21.7.4";
version = "21.8.12";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e";
sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476";
};
nativeBuildInputs = [ qmake qttools ];

View File

@ -1,63 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, glib
, gtk3
, vala
, json-glib
, libgee
, meson
, ninja
, pkg-config
, pantheon
, python3
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "timetable";
version = "1.1.0";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
python3
wrapGAppsHook
];
buildInputs = [
glib
gtk3
json-glib
libgee
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Plot out your own timetable for the week and organize it";
homepage = "https://github.com/lainsce/timetable";
maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers;
license = licenses.gpl2Plus;
};
}

View File

@ -13,26 +13,13 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial";
version = "5.8";
version = "5.9.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw";
sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj";
};
patches = [
# https://phab.mercurial-scm.org/D10638, needed for below patch to apply
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84";
sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g";
})
# https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514
(fetchpatch {
url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea";
sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn";
})
];
format = "other";
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
@ -40,7 +27,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd";
sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca";
sourceRoot = "${pname}-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

View File

@ -4,11 +4,11 @@
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
version = "5.9";
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a";
};
# Extension point for when thg's mercurial is lagging behind mainline.

View File

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
mkdir -p $out/share
cp -R files/* $out/share
cp -R examples files/* $out/share
'';
postFixup = ''

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20210802";
version = "20210901";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "sha256-run7F1iGq1h7o06zS/RNpCMhK5WDH++knLN+MvMcSy8=";
sha256 = "sha256-SbqEHLXSomUUaLRJA1MJbtF1lTQPiWSUXgapjEzSl00=";
};
nativeBuildInputs = [ gtk3 ];

View File

@ -1,30 +1,27 @@
{ lib, stdenv, fetchFromGitHub
, python3, boost
, cmake
}:
stdenv.mkDerivation rec {
pname = "trellis";
version = "2021.07.06";
{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }:
let
rev = "03e0070f263fbe31c247de61d259544722786210";
# git describe --tags
realVersion = with lib; with builtins;
"1.0-482-g${substring 0 7 (elemAt srcs 0).rev}";
realVersion = "1.0-532-g${builtins.substring 0 7 rev}";
in stdenv.mkDerivation rec {
pname = "trellis";
version = "2021-09-01";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
rev = "dff1cbcb1bd30de7e96f8a059f2e19be1bb2e44d";
sha256 = "1gbrka9gqn124shx448aivbgywyp30zyjwfazr7v49lhrl7d46lb";
inherit rev;
sha256 = "joQMsjVj8d3M3IaqOkfVQ1I5qPDM8HHJiye+Ak8f3dg=";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "0ee729d20eaf9f1e0f1d657bc6452e3ffe6a0d63";
sha256 = "0069c98bb4wilxz21snwc39yy0rm7ffma179djyz57d99p0vcfkq";
rev = "fdf4bf275a7402654bc643db537173e2fbc86103";
sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA=";
name = "trellis-database";
})
];
@ -34,14 +31,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ];
cmakeFlags = [
"-DCURRENT_GIT_VERSION=${realVersion}"
# TODO: should this be in stdenv instead?
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
];
preConfigure = with builtins; ''
rmdir database && ln -sfv ${elemAt srcs 1} ./database
preConfigure = ''
rmdir database && ln -sfv ${builtins.elemAt srcs 1} ./database
source environment.sh
cd libtrellis
'';
@ -53,9 +47,9 @@ stdenv.mkDerivation rec {
to provide sufficient information to develop a free and
open Verilog to bitstream toolchain for these devices.
'';
homepage = "https://github.com/SymbiFlow/prjtrellis";
license = lib.licenses.isc;
homepage = "https://github.com/YosysHQ/prjtrellis";
license = licenses.isc;
maintainers = with maintainers; [ q3k thoughtpolice emily ];
platforms = lib.platforms.all;
platforms = platforms.all;
};
}

View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
@ -7,9 +9,9 @@ stdenv.mkDerivation rec {
version = "21.2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v";
};
@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
and buffer management for the Intel(R) Graphics Compute Runtime for
OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
'';
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ primeos ];
};
}

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "aiokafka";
version = "0.7.1";
version = "0.7.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D89ppIUliJJMDuCySrZUyN6Rlm01gFskz6ayHmqploc=";
sha256 = "sha256-D+91k4zVg28qPbWIrvyXi6WtDs1jeJt9jFGsrSBA3cs=";
};
nativeBuildInputs = [

View File

@ -1,31 +1,36 @@
{ lib
, fetchPypi
, buildPythonPackage
, isPy3k
, pythonOlder
, ifaddr
, bitstring
}:
buildPythonPackage rec {
pname = "aiolifx";
version = "0.6.10";
version = "0.7.0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "b3aaf814dbc03666b22b08103990f260e58616ea64f2a28396653ef3b5fad4f9";
sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o=";
};
propagatedBuildInputs = [
bitstring
ifaddr
];
# tests are not implemented
doCheck = false;
disabled = !isPy3k;
propagatedBuildInputs = [ bitstring ifaddr ];
pythonImportsCheck = [ "aiolifx" ];
meta = with lib; {
description = "API for local communication with LIFX devices over a LAN";
homepage = "https://github.com/frawau/aiolifx";
license = licenses.mit;
description = "API for local communication with LIFX devices over a LAN with asyncio";
maintainers = with maintainers; [ netixx ];
};
}

View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "anyascii";
version = "0.2.0";
version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh";
sha256 = "sha256-JPJ0Mftkxsk6MxJftm+MugB6UmK8H6q+r+2l9LtwtZM=";
};
checkInputs = [

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cogapp";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a";
sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6";
};
# there are no tests

View File

@ -1,5 +1,4 @@
{ lib, fetchPypi, buildPythonPackage,
wrapt, pytest, tox }:
{ lib, fetchPypi, buildPythonPackage, wrapt, pytest }:
buildPythonPackage rec {
pname = "Deprecated";

View File

@ -1,24 +1,38 @@
{ lib, fetchPypi, buildPythonPackage, isPy27
, mock, pytestCheckHook, nose, hypothesis
{ lib
, buildPythonPackage
, fetchPypi
, hypothesis
, isPy27
, mock
, nose
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dpath";
version = "2.0.1";
version = "2.0.2";
disabled = isPy27; # uses python3 imports
src = fetchPypi {
inherit pname version;
sha256 = "bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa";
sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64=";
};
# use pytest as nosetests hangs
checkInputs = [ mock nose pytestCheckHook hypothesis ];
checkInputs = [
hypothesis
mock
nose
pytestCheckHook
];
pythonImportsCheck = [ "dpath" ];
meta = with lib; {
description = "Python library for accessing and searching dictionaries via /slashed/paths ala xpath";
homepage = "https://github.com/akesterson/dpath-python";
license = [ licenses.mit ];
description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath";
maintainers = [ maintainers.mmlb ];
license = with licenses; [ mit ];
maintainers = with maintainers; [ mmlb ];
};
}

View File

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.5.0";
version = "4.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs=";
sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f";
};
propagatedBuildInputs = [

View File

@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.25.1";
version = "2.26.0";
src = fetchPypi {
inherit pname version;
sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d";
sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109";
};
propagatedBuildInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "2.0.0";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc=";
sha256 = "cac55be7802e3424b8f022d8a572a8349327e7ce8494eee5e0f4df02458b1813";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "lupa";
version = "1.9";
version = "1.10";
src = fetchPypi {
inherit pname version;
sha256 = "13ifv0nxbf70xg69sp49j484m8cnid7rgh8f94pgfb50dj01vqd3";
sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE=";
};
nativeBuildInputs = [ cython ];

View File

@ -34,7 +34,7 @@ buildPythonPackage rec {
pytest-regressions
pytestCheckHook
];
pytestImportsCheck = [ "markdown_it" ];
pythonImportsCheck = [ "markdown_it" ];
meta = with lib; {
description = "Markdown parser done right";

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "numpy-stl";
version = "2.16.0";
version = "2.16.2";
src = fetchPypi {
inherit pname version;
sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742";
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
};
checkInputs = [ pytest pytest-runner ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-nomad";
version = "1.2.1";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3";
sha256 = "67731d050472923581c43a39a8f01567468e8b3c8e83465b762c99eb0e5e23bc";
};
propagatedBuildInputs = [ requests ];
@ -14,6 +14,8 @@ buildPythonPackage rec {
# Tests require nomad agent
doCheck = false;
pythonImportsCheck = [ "nomad" ];
meta = with lib; {
description = "Python client library for Hashicorp Nomad";
homepage = "https://github.com/jrxFive/python-nomad";

View File

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, buildPythonPackage, docutils }:
buildPythonPackage rec {
pname = "rstcheck";
version = "v3.3.1";
src = fetchFromGitHub {
owner = "myint";
repo = pname;
rev = version;
sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI=";
};
pythonImportsCheck = [ "rstcheck" ];
propagatedBuildInputs = [ docutils ];
meta = with lib; {
description = "Checks syntax of reStructuredText and code blocks nested within it";
homepage = "https://github.com/myint/rstcheck";
license = licenses.mit;
maintainers = with maintainers; [ staccato ];
};
}

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "surepy";
version = "0.7.0";
version = "0.7.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "benleb";
repo = pname;
rev = "v${version}";
sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60";
sha256 = "sha256-h2PEzS3R7NXIUWYOiTpe5ZEU1RopaRj1phudmvcklug=";
};
postPatch = ''

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "uproot";
version = "4.0.8";
version = "4.1.1";
# fetch from github for tests
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot4";
rev = version;
sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4=";
sha256 = "sha256-qh/rtZDE6L1IQJjzE+ns0eSG1BKbES7s3A/35hc+tXg=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,33 @@
{ rustPlatform, fetchFromGitHub, lib }:
rustPlatform.buildRustPackage rec {
pname = "pipes-rs";
version = "1.4.4";
src = fetchFromGitHub {
owner = "lhvy";
repo = pname;
rev = "v${version}";
sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo=";
};
cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk";
doInstallCheck = true;
installCheckPhase = ''
if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then
echo '${pname} smoke check passed'
else
echo '${pname} smoke check failed'
return 1
fi
'';
meta = with lib; {
description = "An over-engineered rewrite of pipes.sh in Rust";
homepage = "https://github.com/lhvy/pipes-rs";
license = with licenses; [ asl20 mit ];
maintainers = [ maintainers.vanilla ];
};
}

View File

@ -15,6 +15,10 @@
"date": "2021-08-22",
"new": "toggleterm-nvim"
},
"sql-nvim": {
"date": "2021-09-03",
"new": "sqlite-lua"
},
"vim-jade": {
"date": "2020-03-27",
"new": "vim-pug"

File diff suppressed because it is too large Load Diff

View File

@ -203,7 +203,7 @@ self: super: {
direnv-vim = super.direnv-vim.overrideAttrs (oa: {
preFixup = oa.preFixup or "" + ''
substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \
substituteInPlace $out/share/vim-plugins/direnv.vim/autoload/direnv.vim \
--replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
"let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')"
'';
@ -479,7 +479,7 @@ self: super: {
dependencies = with self; [ skim ];
});
sql-nvim = super.sql-nvim.overrideAttrs (old: {
sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
postPatch = ''
substituteInPlace lua/sql/defs.lua \
--replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or"
@ -516,7 +516,7 @@ self: super: {
});
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: {
dependencies = with self; [ sql-nvim telescope-nvim ];
dependencies = with self; [ sqlite-lua telescope-nvim ];
});
telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: {

View File

@ -62,6 +62,7 @@ chikatoike/concealedyank.vim
chikatoike/sourcemap.vim
chkno/vim-haskell-module-name
chr4/nginx.vim
chr4/sslsecure.vim
chrisbra/CheckAttach
chrisbra/csv.vim
chrisbra/NrrwRgn
@ -122,6 +123,7 @@ easymotion/vim-easymotion
eddiebergman/nvim-treesitter-pyfold
eddyekofo94/gruvbox-flat.nvim
editorconfig/editorconfig-vim
edkolev/tmuxline.vim
edluffy/hologram.nvim@main
edluffy/specs.nvim@main
edwinb/idris2-vim
@ -299,6 +301,7 @@ junegunn/seoul256.vim
junegunn/vader.vim
junegunn/vim-after-object
junegunn/vim-easy-align
junegunn/vim-emoji
junegunn/vim-github-dashboard
junegunn/vim-peekaboo
junegunn/vim-plug
@ -456,7 +459,7 @@ nanotech/jellybeans.vim
natebosch/vim-lsc
nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount
nathunsmitty/nvim-ale-diagnostic@main
nathanmsmith/nvim-ale-diagnostic@main
navicore/vissort.vim
nbouscal/vim-stylish-haskell
ncm2/float-preview.nvim
@ -481,6 +484,7 @@ neoclide/coc-neco
neoclide/coc.nvim@release
neoclide/denite-extra
neoclide/denite-git
neoclide/jsonc.vim
neoclide/vim-easygit
neomake/neomake
neovim/nvim-lspconfig
@ -601,6 +605,7 @@ rktjmp/fwatch.nvim@main
rktjmp/lush.nvim@main
rmagatti/auto-session@main
rmagatti/goto-preview@main
RobertAudi/securemodelines
rodjek/vim-puppet
romainl/vim-cool
romainl/vim-qf
@ -622,6 +627,7 @@ rust-lang/rust.vim
ryanoasis/vim-devicons
ryvnf/readline.vim
saadparwaiz1/cmp_luasnip
saecki/crates.nvim
sainnhe/edge
sainnhe/gruvbox-material
sainnhe/sonokai
@ -690,7 +696,7 @@ tamago324/compe-zsh
tamago324/lir.nvim
tami5/compe-conjure
tami5/lispdocs.nvim
tami5/sql.nvim
tami5/sqlite.lua
tbastos/vim-lua
tbodt/deoplete-tabnine
ternjs/tern_for_vim
@ -794,6 +800,7 @@ vim-erlang/vim-erlang-tags
vim-pandoc/vim-pandoc
vim-pandoc/vim-pandoc-after
vim-pandoc/vim-pandoc-syntax
vim-python/python-syntax
vim-ruby/vim-ruby
vim-scripts/a.vim
vim-scripts/align
@ -848,6 +855,7 @@ whonore/Coqtail
will133/vim-dirdiff
wincent/command-t
wincent/ferret
wincent/terminus
windwp/nvim-autopairs
winston0410/cmd-parser.nvim
winston0410/range-highlight.nvim

View File

@ -1400,6 +1400,19 @@ let
vadimcn.vscode-lldb = callPackage ./vscode-lldb { };
viktorqvarfordt.vscode-pitch-black-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pitch-black-theme";
publisher = "ViktorQvarfordt";
version = "1.2.4";
sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw=";
};
meta = {
license = lib.licenses.mit;
};
};
vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "highlight-matching-tag";

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
version = "1.2.8";
version = "1.3.3";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc=";
sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
binary files.
'';
homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice joachifm ];
};

View File

@ -1,5 +1,5 @@
{ lib, stdenv,
fetchzip,
fetchFromGitHub,
makeWrapper,
cmake,
python3,
@ -17,29 +17,17 @@
cereal
}:
let
version = "2020.2";
minizip = "f5282643091dc1b33546bb8d8b3c23d78fdba231";
domoticz-src = fetchzip {
url = "https://github.com/domoticz/domoticz/archive/${version}.tar.gz";
sha256 = "1b4pkw9qp7f5r995vm4xdnpbwi9vxjyzbnk63bmy1xkvbhshm0g3";
};
minizip-src = fetchzip {
url = "https://github.com/domoticz/minizip/archive/${minizip}.tar.gz";
sha256 = "1vddrzm4pwl14bms91fs3mbqqjhcxrmpx9a68b6nfbs20xmpnsny";
};
in
stdenv.mkDerivation rec {
pname = "domoticz";
inherit version;
version = "2021.1";
src = domoticz-src;
postUnpack = ''
cp -r ${minizip-src}/* $sourceRoot/extern/minizip
'';
src = fetchFromGitHub {
owner = "domoticz";
repo = pname;
rev = version;
sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk";
fetchSubmodules = true;
};
buildInputs = [
openssl

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
rev = "v${version}";
sha256 = "sha256-DmYGP50GsthxvhXUMkwV+mvcfCjCMu90VMe5woNvf1w=";
sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo=";
};
propagatedBuildInputs = with python3Packages; [

View File

@ -0,0 +1,41 @@
{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }:
stdenv.mkDerivation rec {
pname = "jibri";
version = "8.0-93-g51fe7a2";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "1w78aa3rfdc4frb68ymykrbazxqrcv8mcdayqmcb72q1aa854c7j";
};
dontBuild = true;
nativeBuildInputs = [ dpkg makeWrapper ];
unpackCmd = "dpkg-deb -x $src debcontents";
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,opt/jitsi/jibri,etc/jitsi/jibri}
mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/
mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/
makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar"
runHook postInstall
'';
meta = with lib; {
description = "JItsi BRoadcasting Infrastructure";
longDescription = ''
Jibri provides services for recording or streaming a Jitsi Meet conference.
It works by launching a Chrome instance rendered in a virtual framebuffer and capturing and
encoding the output with ffmpeg. It is intended to be run on a separate machine (or a VM), with
no other applications using the display or audio devices. Only one recording at a time is
supported on a single jibri.
'';
homepage = "https://github.com/jitsi/jibri";
license = licenses.asl20;
maintainers = teams.jitsi.members;
platforms = platforms.linux;
};
}

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata }:
buildGoModule rec {
pname = "grafana";
@ -47,6 +47,16 @@ buildGoModule rec {
"-s" "-w" "-X main.version=${version}"
];
# Tests start http servers which need to bind to local addresses:
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
__darwinAllowLocalNetworking = true;
# On Darwin, files under /usr/share/zoneinfo exist, but fail to open in sandbox:
# TestValueAsTimezone: date_formats_test.go:33: Invalid has err for input "Europe/Amsterdam": operation not permitted
preCheck = ''
export ZONEINFO=${tzdata}/share/zoneinfo
'';
postInstall = ''
tar -xvf $srcStatic
mkdir -p $out/share/grafana
@ -60,6 +70,6 @@ buildGoModule rec {
license = licenses.agpl3;
homepage = "https://grafana.com";
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
version = "1.0.1";
version = "1.1.0";
pname = "tempo";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "tempo";
sha256 = "sha256-4QrCoz4taNXV13g+Pi0j7pTWy0hLY/qAdTOIMMuDWIA=";
sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk=";
};
vendorSha256 = null;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rdfind";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21";
};
buildInputs = [ nettle ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://rdfind.pauldreik.se/";
description = "Removes or hardlinks duplicate files very swiftly";
license = lib.licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.wmertens ];
platforms = platforms.all;
};

View File

@ -2,22 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "10.0.0";
version = "11.0.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU=";
sha256 = "198y2k3vi8dh9kfqgl7vpgkxvjlfvryi9c8hmb43m0lpwsja0010";
};
cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o=";
cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y";
buildInputs = lib.optional stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Kakoune Language Server Protocol Client";
homepage = "https://github.com/ul/kak-lsp";
homepage = "https://github.com/kak-lsp/kak-lsp";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = [ maintainers.spacekookie ];
};

View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tfk8s";
version = "0.1.6";
version = "0.1.7";
tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = tag;
sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI=";
sha256 = "0mkfggwjrsp0rzh7ll6nmp9kqcw4fl8q81vk67z5mbd276dkyxrb";
};
vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I=";

View File

@ -2,18 +2,17 @@
stdenv.mkDerivation rec {
pname = "sstp-client";
version = "1.0.13";
version = "1.0.15";
src = fetchurl {
url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln";
sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ=";
};
patchPhase =
''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
postPatch = ''
sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c
sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c
'';
configureFlags = [
"--with-openssl=${openssl.dev}"
@ -22,13 +21,14 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevent openssl ppp ];
meta = {
meta = with lib; {
description = "SSTP client for Linux";
homepage = "http://sstp-client.sourceforge.net/";
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.ktosiek ];
license = lib.licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ktosiek ];
license = licenses.gpl2Plus;
};
}

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
bundler-audit (0.8.0)
bundler-audit (0.9.0.1)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
thor (1.1.0)
@ -13,4 +13,4 @@ DEPENDENCIES
bundler-audit
BUNDLED WITH
2.1.4
2.2.20

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v";
sha256 = "05k19l5388248rd74cn2lm2ksci7fzmga74n835v7k31m4kbzw8v";
type = "gem";
};
version = "0.8.0";
version = "0.9.0.1";
};
thor = {
groups = ["default"];

View File

@ -1,26 +1,48 @@
{ lib, stdenv, fetchurl, openssl, libpcap
{ lib
, stdenv
, clang
, fetchFromGitHub
, installShellFiles
, openssl
, libpcap
}:
with lib;
stdenv.mkDerivation rec {
pname = "cowpatty";
version = "4.6";
version = "4.8";
buildInputs = [ openssl libpcap ];
src = fetchurl {
url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
src = fetchFromGitHub {
owner = "joswr1ght";
repo = pname;
rev = version;
sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
};
installPhase = "make DESTDIR=$out BINDIR=/bin install";
nativeBuildInputs = [
clang
installShellFiles
];
meta = {
buildInputs = [
openssl
libpcap
];
makeFlags = [
"DESTDIR=$(out)"
"BINDIR=/bin"
];
postInstall = ''
installManPage cowpatty.1
installManPage genpmk.1
'';
meta = with lib; {
description = "Offline dictionary attack against WPA/WPA2 networks";
license = licenses.gpl2;
homepage = "https://www.willhackforsushi.com/?page_id=50";
maintainers = with maintainers; [ nico202 ];
homepage = "https://github.com/joswr1ght/cowpatty";
license = licenses.bsd3;
maintainers = with maintainers; [ nico202 fab ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "credential-detector";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ynori7";
repo = pname;
rev = "v${version}";
sha256 = "1g5ja32rsf1b7y9gvmy29qz2ymyyvgh53wzd6vvknfla1df0slab";
};
vendorSha256 = "1mn3sysvdz4b94804gns1yssk2q08djq3kq3cd1h7gm942zwrnq4";
meta = with lib; {
description = "Tool to detect potentially hard-coded credentials";
homepage = "https://github.com/ynori7/credential-detector";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,25 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "dalfox";
version = "2.4.9";
src = fetchFromGitHub {
owner = "hahwul";
repo = pname;
rev = "v${version}";
sha256 = "1g0bafg3lgsqy8mjyzvvy9l1wp1rxqwpba3dkx6xisjkpbycxql8";
};
vendorSha256 = "1mw58zbihw2fzbpqwydfrrkcwqjkjqdzp37m4dijhx1pbzkv9gzl";
meta = with lib; {
description = "Tool for analysing parameter and XSS scanning";
homepage = "https://github.com/hahwul/dalfox";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.5.0";
version = "7.6.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s7EOCoGciGT5+Fose9BffsHHE/SsSMmNoWGmeAv6Agk=";
sha256 = "sha256-XRpbbtQiF9EnGMICjyXXm2XjuR0jGC7UiY+UHIAMODM=";
};
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc=";
ldflags = [
"-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"

View File

@ -0,0 +1,30 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gotestwaf";
version = "0.3.1";
src = fetchFromGitHub {
owner = "wallarm";
repo = pname;
rev = "v${version}";
sha256 = "0c627bxx0mlxhc1fsd2k3x1lm5855pl215m88la662d70559z6k8";
};
vendorSha256 = null;
postFixup = ''
# Rename binary
mv $out/bin/cmd $out/bin/${pname}
'';
meta = with lib; {
description = "Tool for API and OWASP attack simulation";
homepage = "https://github.com/wallarm/gotestwaf";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "metabigor";
version = "1.9";
src = fetchFromGitHub {
owner = "j3ssie";
repo = pname;
rev = "v${version}";
sha256 = "0gjqjz35m9hj4dpch9akkjs895qrp8fwhcsn474lz6z2q6sb65pr";
};
vendorSha256 = "071s3vlz0maz1597l8y899758g24vh58s4kam4q2mxkzfynzs0cr";
# Disabled for now as there are some failures ("undefined:")
doCheck = false;
meta = with lib; {
description = "Tool to perform OSINT tasks";
homepage = "https://github.com/j3ssie/metabigor";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -5,17 +5,16 @@
buildGoModule rec {
pname = "scilla";
version = "20210118-${lib.strings.substring 0 7 rev}";
rev = "74dd81492fef92b95765df1d0f629276a146a5a4";
version = "1.1.1";
src = fetchFromGitHub {
owner = "edoardottt";
repo = pname;
inherit rev;
sha256 = "10qvaigfarljydfb9vx2fb9nk293j4g9w2h9mr8xw6adbvl0qr9q";
rev = "v${version}";
sha256 = "sha256-xg8qnpYRdSGaFkjmQLbjMFIU419ASEHtFA8h8ads/50=";
};
vendorSha256 = "04wqsl4269gc3r6l9srqhcq19zarnyyab8k1shj3w6lkfcc61z25";
vendorSha256 = "sha256-PFfzlqBuasTNeCNnu5GiGyQzBQkbe83q1EqCsWTor18=";
meta = with lib; {
description = "Information gathering tool for DNS, ports and more";

View File

@ -1,17 +1,29 @@
{ fetchFromGitHub, lib, rustPlatform }:
{ cmake
, fetchFromGitHub
, lib
, rustPlatform
, stdenv
, libiconv
, CoreFoundation
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.5.4";
version = "0.6.2";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
sha256 = "1zdzi98qywlwk5bp47963vya2p2ahrbjkc9h63lmb05wlas9s78y";
sha256 = "1xjp56asfn37kr0fsrjkil20nf372q70cijqb5ll2sq2zwjnyyzn";
};
cargoSha256 = "0lvd5xpgh2vq2lszzb0fs6ha2vb419a5w0hlkq3287vq3ya3p4qg";
cargoSha256 = "12n33gwxcym5z5n762wmzcck4zmmn42kh04nwpdb3az4apghdp3z";
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ];
meta = with lib; {
description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string";

View File

@ -926,6 +926,7 @@ mapAliases ({
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03
timescale-prometheus = promscale; # added 2020-09-29
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05
tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11

View File

@ -338,6 +338,8 @@ with pkgs;
creddump = callPackage ../tools/security/creddump {};
credential-detector = callPackage ../tools/security/credential-detector { };
credslayer = callPackage ../tools/security/credslayer { };
device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {};
@ -7274,6 +7276,8 @@ with pkgs;
mscgen = callPackage ../tools/graphics/mscgen { };
metabigor = callPackage ../tools/security/metabigor { };
metasploit = callPackage ../tools/security/metasploit { };
ms-sys = callPackage ../tools/misc/ms-sys { };
@ -9479,8 +9483,6 @@ with pkgs;
timetrap = callPackage ../applications/office/timetrap { };
timetable = callPackage ../applications/office/timetable { };
timekeeper = callPackage ../applications/office/timekeeper { };
timezonemap = callPackage ../development/libraries/timezonemap { };
@ -19963,6 +19965,8 @@ with pkgs;
jetty = callPackage ../servers/http/jetty { };
jibri = callPackage ../servers/jibri { };
jicofo = callPackage ../servers/jicofo { };
jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { };
@ -20118,7 +20122,7 @@ with pkgs;
modules = [ nginxModules.dav nginxModules.moreheaders ];
};
nginxModules = callPackage ../servers/http/nginx/modules.nix { };
nginxModules = recurseIntoAttrs (callPackage ../servers/http/nginx/modules.nix { });
# We should move to dynmaic modules and create a nginxFull package with all modules
nginxShibboleth = nginxStable.override {
@ -21571,6 +21575,8 @@ with pkgs;
pipes = callPackage ../misc/screensavers/pipes { };
pipes-rs = callPackage ../misc/screensavers/pipes-rs { };
pipework = callPackage ../os-specific/linux/pipework { };
pktgen = callPackage ../os-specific/linux/pktgen { };
@ -29949,6 +29955,8 @@ with pkgs;
conglomerate = callPackage ../applications/science/biology/conglomerate { };
dalfox = callPackage ../tools/security/dalfox { };
dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
deepdiff = with python3Packages; toPythonApplication deepdiff;
@ -31106,6 +31114,8 @@ with pkgs;
gobuster = callPackage ../tools/security/gobuster { };
gotestwaf = callPackage ../tools/security/gotestwaf { };
guetzli = callPackage ../applications/graphics/guetzli { };
gummi = callPackage ../applications/misc/gummi { };
@ -31114,7 +31124,9 @@ with pkgs;
hatari = callPackage ../misc/emulators/hatari { };
hck = callPackage ../tools/text/hck { };
hck = callPackage ../tools/text/hck {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
helm = callPackage ../applications/audio/helm { };

View File

@ -7847,6 +7847,8 @@ in {
rst2ansi = callPackage ../development/python-modules/rst2ansi { };
rstcheck = callPackage ../development/python-modules/rstcheck { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
rtoml = callPackage ../development/python-modules/rtoml { };