Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-04-22 12:06:27 +00:00 committed by GitHub
commit 1eabfe5413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 405 additions and 370 deletions

View file

@ -9687,12 +9687,6 @@
githubId = 102685;
name = "Thomas Friese";
};
tavyc = {
email = "octavian.cerna@gmail.com";
github = "tavyc";
githubId = 3650609;
name = "Octavian Cerna";
};
tazjin = {
email = "mail@tazj.in";
github = "tazjin";

View file

@ -163,7 +163,7 @@ in
# List packages installed in system profile. To search, run:
# \$ nix search wget
# environment.systemPackages = with pkgs; [
# nano vim # don't forget to add an editor to edit configuration.nix!
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# firefox
# ];

View file

@ -180,6 +180,6 @@ in
};
meta.maintainers = with lib.maintainers; [ tavyc ];
meta.maintainers = with lib.maintainers; [ ];
}

View file

@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
name = "quagga";
meta = with pkgs.lib.maintainers; {
maintainers = [ tavyc ];
maintainers = [ ];
};
nodes = {

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Advanced drum machine";
homepage = "http://www.hydrogen-music.org";
license = licenses.gpl2Only;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu orivej ];
};

View file

@ -7,6 +7,7 @@
, pcre
, pkg-config
, python3
, python3Packages # sphinx-build
, lib
, stdenv
, xcbproto
@ -18,41 +19,48 @@
, xcbutilxrm
, makeWrapper
, removeReferencesTo
, alsaLib
, curl
, libmpdclient
, libpulseaudio
, wirelesstools
, libnl
, i3
, i3-gaps
, jsoncpp
# optional packages-- override the variables ending in 'Support' to enable or
# disable modules
, alsaSupport ? true, alsaLib ? null
, githubSupport ? false, curl ? null
, mpdSupport ? false, libmpdclient ? null
, pulseSupport ? false, libpulseaudio ? null
, iwSupport ? false, wirelesstools ? null
, nlSupport ? true, libnl ? null
, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
# override the variables ending in 'Support' to enable or disable modules
, alsaSupport ? true
, githubSupport ? false
, mpdSupport ? false
, pulseSupport ? false
, iwSupport ? false
, nlSupport ? true
, i3Support ? false
, i3GapsSupport ? false
}:
assert alsaSupport -> alsaLib != null;
assert githubSupport -> curl != null;
assert mpdSupport -> libmpdclient != null;
assert pulseSupport -> libpulseaudio != null;
assert iwSupport -> ! nlSupport && wirelesstools != null;
assert nlSupport -> ! iwSupport && libnl != null;
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
stdenv.mkDerivation rec {
pname = "polybar";
version = "3.5.2";
version = "3.5.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x";
sha256 = "sha256-oRtTm5bXdL0C2WJsaK8H2Oc40DPWgAfjP7FgIHrpKGI=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
pkg-config
python3Packages.sphinx
removeReferencesTo
(if i3Support || i3GapsSupport then makeWrapper else null)
];
buildInputs = [
cairo
libXdmcp
@ -79,8 +87,6 @@ stdenv.mkDerivation rec {
(if i3Support || i3GapsSupport then jsoncpp else null)
(if i3Support then i3 else null)
(if i3GapsSupport then i3-gaps else null)
(if i3Support || i3GapsSupport then makeWrapper else null)
];
postInstall = if i3Support
@ -93,18 +99,13 @@ stdenv.mkDerivation rec {
''
else '''';
nativeBuildInputs = [
cmake
pkg-config
removeReferencesTo
];
postFixup = ''
remove-references-to -t ${stdenv.cc} $out/bin/polybar
'';
meta = with lib; {
homepage = "https://polybar.github.io/";
changelog = "https://github.com/polybar/polybar/releases/tag/${version}";
description = "A fast and easy-to-use tool for creating status bars";
longDescription = ''
Polybar aims to help users build beautiful and highly customizable
@ -112,7 +113,7 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting.
'';
license = licenses.mit;
maintainers = with maintainers; [ afldcr Br1ght0ne ];
maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ];
platforms = platforms.linux;
};
}

View file

@ -1,20 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
, openssl
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "stork";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "jameslittle230";
repo = "stork";
rev = "v${version}";
sha256 = "sha256-pBJ9n1pQafXagQt9bnj4N1jriczr47QLtKiv+UjWgTg=";
sha256 = "sha256-gPrXeS7XT38Dil/EBwmeKIJrmPlEK+hmiyHi4p28tl0=";
};
cargoSha256 = "sha256-u8L4ZeST4ExYB2y8E+I49HCy41dOfhR1fgPpcVMVDuk=";
cargoSha256 = "sha256-9YKCtryb9mTPz9iWE7Iuk2SKgV0knWRbaouF+1DCjv8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
meta = with lib; {
description = "Impossibly fast web search, made for static sites";

View file

@ -164,11 +164,6 @@ let
./patches/fix-missing-atspi2-dependency.patch
++ optionals (chromiumVersionAtLeast "91") [
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
(githubPatch
# Revert "Reland #7 of "Force Python 3 to be used in build.""
"38b6a9a8e5901766613879b6976f207aa163588a"
"1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
)
];
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''

View file

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "91.0.4472.10",
"sha256": "168121aznynks5waj3mm2m036mbrlmqmp2kmnn9r4ibq2x01dpxm",
"sha256bin64": "05bk6gmmfsh50jjlb6lmwqhhbs0v0hlijsmxpk9crdx2gw071rlr",
"version": "91.0.4472.19",
"sha256": "0p51cxz0dm9ss9k7b91c0nd560mgi2x4qdcpg12vdf8x24agai5x",
"sha256bin64": "1x1901f5782c6aj6sbj8i4hhj545vjl4pplf35i4bjbcaxq3ckli",
"deps": {
"gn": {
"version": "2021-04-06",

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "bit";
version = "1.0.6";
version = "1.1.1";
src = fetchFromGitHub {
owner = "chriswalz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-juQAFVqs0d4EtoX24EyrlKd2qRRseP+jKfM0ymkD39E=";
sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60=";
};
vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA=";

View file

@ -1,27 +1,37 @@
{ gestures ? false
, lib, stdenv, fetchurl, pkg-config
, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
, libXpm, libXt, librsvg, libpng, fribidi, perl
, libstroke ? null
}:
assert gestures -> libstroke != null;
{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub
, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }:
stdenv.mkDerivation rec {
pname = "fvwm";
version = "2.6.9";
src = fetchurl {
url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
src = fetchFromGitHub {
owner = "fvwmorg";
repo = pname;
rev = version;
sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
cairo fontconfig freetype
libXft libXcursor libXinerama libXpm libXt
librsvg libpng fribidi perl
] ++ lib.optional gestures libstroke;
cairo
fontconfig
freetype
libXft
libXcursor
libXinerama
libXpm
libXt
librsvg
libpng
fribidi
perl
readline
libxslt
] ++ lib.optional enableGestures libstroke;
configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ];
meta = {
homepage = "http://fvwm.org";

View file

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "libfm-qt";
version = "0.16.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p";
sha256 = "0jdsqvwp81y4ylabrqdc673x80fp41rpp5w7c1v9zmk9k8z4s5ll";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "liblxqt";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk";
sha256 = "0n0pjz5wihchfcji8qal0lw8kzvv3im50v1lbwww4ymrgacz9h4l";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libqtxdg";
version = "3.6.0";
version = "3.7.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck";
sha256 = "1x806hdics3d49ys0a2vkln9znidj82qscjnpcqxclxn26xqzd91";
};
nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
mkDerivation rec {
pname = "libsysstat";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk";
sha256 = "14q55iayygmjh63zgsb9qa4af766gj9b0jsrmfn85fdiqb8p8yfz";
};
nativeBuildInputs = [

View file

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lximage-qt";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb";
sha256 = "1xajsblk2954crvligvrgwp7q1pj7124xdfnlq9k9q0ya2xc36lx";
};
nativeBuildInputs = [

View file

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-about";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h";
sha256 = "011jcab47iif741azfgvf52my118nwkny5m0pa7nsqyv8ad1fsiw";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-admin";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz";
sha256 = "1xi169gz1sarv7584kg33ymckqlx9ddci7r9m0dlm4a7mw7fm0lf";
};
nativeBuildInputs = [
@ -40,8 +40,11 @@ mkDerivation rec {
];
postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
-i lxqt-admin-user/CMakeLists.txt
for f in lxqt-admin-{time,user}/CMakeLists.txt; do
substituteInPlace $f --replace \
"\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
"$out/share/polkit-1/actions"
done
'';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };

View file

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "lxqt-archiver";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6";
sha256 = "0wpayzcyqcnvzk95bqql7p07l8p7mwdgdj7zlbcsdn0wis4yhjm6";
};
nativeBuildInputs = [

View file

@ -6,18 +6,19 @@
, pcre
, qtbase
, glib
, perl
, lxqtUpdateScript
}:
mkDerivation rec {
pname = "lxqt-build-tools";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6";
sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l";
};
nativeBuildInputs = [
@ -32,6 +33,10 @@ mkDerivation rec {
pcre
];
propagatedBuildInputs = [
perl # needed by LXQtTranslateDesktop.cmake
];
setupHook = ./setup-hook.sh;
# We're dependent on this macro doing add_definitions in most places

View file

@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-config";
version = "0.16.1";
version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z";
sha256 = "0b9jihmsqgdfdsisz15j3p53fgf1w30s8irj9zjh52fsj58p924p";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-globalkeys";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19";
sha256 = "135292l8w9sngg437n1zigkap15apifyqd9847ln84bxsmcj8lay";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-notificationd";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc";
sha256 = "1r2cmxcjkm9lvb2ilq2winyqndnamsd9x2ynmfiqidby2pcr9i3a";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129";
sha256 = "18pn7kw9aw7859jnwvjnjcvr50pqsi8gqcxsbx9rvsjrybw2qcgc";
};
nativeBuildInputs = [

View file

@ -30,13 +30,13 @@
mkDerivation rec {
pname = "lxqt-panel";
version = "0.16.1";
version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik";
sha256 = "1wmm4sml7par5z9xcs5qx2y2pdbnnh66zs37jhx9f9ihcmh1sqlw";
};
nativeBuildInputs = [

View file

@ -19,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-policykit";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn";
sha256 = "15f0hnif8zs38qgckif63dds9zgpp3dmg9pg3ppgh664lkbxx7n7";
};
nativeBuildInputs = [

View file

@ -18,13 +18,13 @@
mkDerivation rec {
pname = "lxqt-powermanagement";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy";
sha256 = "1ikkksg5k7jwph7060h8wyk7bdsywvhl47zp23j5gcig0nk62ggf";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "lxqt-qtplugin";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9";
sha256 = "168ii015j57hkccdh27h2fdh8yzs8nzy8nw20wnx6fbcg5401666";
};
nativeBuildInputs = [

View file

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "lxqt-runner";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1";
sha256 = "167gzn6aqk7akzbmrnm7nmcpkl0nphr8axbfgwnw552dnk6v8gn0";
};
nativeBuildInputs = [

View file

@ -11,6 +11,7 @@
, kwindowsystem
, liblxqt
, libqtxdg
, procps
, xorg
, xdg-user-dirs
, lxqtUpdateScript
@ -18,13 +19,13 @@
mkDerivation rec {
pname = "lxqt-session";
version = "0.16.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik";
sha256 = "1nhw3y3dm4crawc1905l6drn0i79fs1dzs8iak0vmmplbiv3fvgg";
};
nativeBuildInputs = [
@ -41,6 +42,7 @@ mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
procps
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs

View file

@ -16,13 +16,13 @@
mkDerivation rec {
pname = "lxqt-sudo";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx";
sha256 = "10s8k83mkqiakh18mh1l7idjp95cy49rg8dh14cy159dk8mchcd0";
};
nativeBuildInputs = [

View file

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "lxqt-themes";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz";
sha256 = "13zh5yrq0f96cn5m6i7zdvgb9iw656fad5ps0s2zx6x8mj2mv64f";
};
nativeBuildInputs = [

View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "pavucontrol-qt";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0";
sha256 = "0syc4bc2k7961la2c77787akhcljspq3s2nyqvb7mq7ddq1xn0wx";
};
nativeBuildInputs = [

View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "pcmanfm-qt";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj";
sha256 = "1awyncpypygsrg7d2nc6xh1l4xaln3ypdliy4xmq8bf94sh9rf0y";
};
nativeBuildInputs = [

View file

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "qps";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa";
sha256 = "0fihhnb7vp6x072spg1fnxaip4sq9mbvhrfqdwnzph5dlyvs54nj";
};
nativeBuildInputs = [

View file

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "qterminal";
version = "0.16.1";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d";
sha256 = "0mdcz45faj9ysw725qzg572968kf5sh6zfw7iiksi26s8kiyhbbp";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "qtermwidget";
version = "0.16.1";
version = "0.17.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w";
sha256 = "0pmkk2mba8z6cgfsd8sy4vhf5d9fn9hvxszzyycyy1ndygjrc1v8";
};
nativeBuildInputs = [

View file

@ -9,6 +9,7 @@
, qtsvg
, kwindowsystem
, libqtxdg
, perl
, xorg
, autoPatchelfHook
, lxqtUpdateScript
@ -16,18 +17,19 @@
mkDerivation rec {
pname = "screengrab";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic";
sha256 = "16dycq40lbvk6jvpj7zp85m23cgvh8nj38fz99gxjfzn2nz1gy4a";
};
nativeBuildInputs = [
cmake
pkg-config
perl # needed by LXQtTranslateDesktop.cmake
autoPatchelfHook # fix libuploader.so and libextedit.so not found
];

View file

@ -8,13 +8,13 @@ let
pkg = self: stdenv.mkDerivation rec {
pname = "hex";
version = "0.20.5";
version = "0.21.1";
src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
rev = "v${version}";
sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6";
sha256 = "3V7hp+gK+ixEX+v9vkzQ5y81LN+CSzOIlSkCJB2RFb8=";
};
setupHook = writeText "setupHook.sh" ''

View file

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc tkerber ];
maintainers = with maintainers; [ dezgeg tkerber ];
};
}

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.39.0";
version = "0.40.0";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A=";
};
checkInputs = [

View file

@ -1,5 +1,18 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, lz4
}:
let
kaitai_compress = fetchFromGitHub {
owner = "kaitai-io";
repo = "kaitai_compress";
rev = "434fb42220ff58778bb9fbadb6152cad7e4f5dd0";
sha256 = "zVnkVl3amUDOB+pnw5SkMGSrVL/dTQ82E8IWfJvKC4Q=";
};
in
buildPythonPackage rec {
pname = "kaitaistruct";
version = "0.9";
@ -9,9 +22,27 @@ buildPythonPackage rec {
sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad";
};
preBuild = ''
ln -s ${kaitai_compress}/python/kaitai kaitai
sed '28ipackages = kaitai/compress' -i setup.cfg
'';
propagatedBuildInputs = [
lz4
];
# no tests
dontCheck = true;
pythonImportsCheck = [
"kaitaistruct"
"kaitai.compress"
];
meta = with lib; {
description = "Kaitai Struct: runtime library for Python";
homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
license = licenses.mit;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flask
, karton-core
, mistune
, prometheus_client
}:
buildPythonPackage rec {
pname = "karton-dashboard";
version = "1.1.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "101qmx6nmiim0vrz2ldk973ns498hnxla1xy7nys9kh9wijg4msk";
};
propagatedBuildInputs = [
flask
karton-core
mistune
prometheus_client
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "Flask==1.1.1" "Flask" \
--replace "karton-core==4.1.0" "karton-core"
'';
# Project has no tests. pythonImportsCheck requires MinIO configuration
doCheck = false;
meta = with lib; {
description = "Web application that allows for Karton task and queue introspection";
homepage = "https://github.com/CERT-Polska/karton-dashboard";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, lzfse
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyliblzfse";
version = "0.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "bb0b899b3830c02fdf3dbde48ea59611833f366fef836e5c32cf8145134b7d3d";
};
preBuild = ''
rm -r lzfse
ln -s ${lzfse.src} lzfse
'';
# no tests
doCheck = false;
pythonImportsCheck = [
"liblzfse"
];
meta = with lib; {
description = "Python bindings for LZFSE";
homepage = "https://github.com/ydkhatri/pyliblzfse";
license = licenses.mit;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.148.0";
version = "0.149.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "sha256-DPHDuTBCsRq+u5kYHwImIXPxq04kW2HiqYsxJrun6n8=";
sha256 = "sha256-/pNCEsCKfYh/jo+3x7usRyPNBRJB4gDu2TAgosSw37c=";
};
installPhase = ''

View file

@ -1,5 +1,4 @@
{ lib
, fetchpatch
, stdenv
, fetchFromGitHub
, buildPackages
@ -27,44 +26,24 @@
, luaBindings ? false
}:
let
inherit (lib) optional;
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
gittap = "5.2.0";
gittip = "cf3db945083fb4dab951874e5ec1283128deab11";
rev = "5.2.0";
version = "5.2.0";
sha256 = "08azxfk6mw2vr0x4zbz0612rk7pj4mfz8shrzc9ima77wb52b8sm";
#</generated>
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "radare2";
inherit version;
version = "5.2.1";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
inherit rev sha256;
rev = version;
sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc";
};
patches = [
# fix build against openssl, included in next release
(fetchpatch {
url = "https://github.com/radareorg/radare2/commit/e5e7469b6450c374e0884d35d44824e1a4eb46b4.patch";
sha256 = "sha256-xTmMHvUdW7d2QG7d4hlvMgEcegND7pGU745TWGqzY44=";
})
];
postInstall = ''
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
'';
WITHOUT_PULL = "1";
makeFlags = [
"GITTAP=${gittap}"
"GITTIP=${gittip}"
"GITTAP=${version}"
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
];
configureFlags = [
@ -89,10 +68,10 @@ stdenv.mkDerivation {
zlib
openssl
libuv
] ++ optional useX11 [ gtkdialog vte gtk2 ]
++ optional rubyBindings [ ruby ]
++ optional pythonBindings [ python3 ]
++ optional luaBindings [ lua ];
] ++ lib.optional useX11 [ gtkdialog vte gtk2 ]
++ lib.optional rubyBindings [ ruby ]
++ lib.optional pythonBindings [ python3 ]
++ lib.optional luaBindings [ lua ];
propagatedBuildInputs = [
# radare2 exposes r_lib which depends on these libraries

View file

@ -1,107 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -p nix -p python3 -p git -i python
# USAGE - just run the script: ./update.py
# When editing this file, make also sure it passes the mypy typecheck
# and is formatted with black.
import fileinput
import json
import xml.etree.ElementTree as ET
from urllib.parse import urlparse
import re
import subprocess
import tempfile
import urllib.request
from datetime import datetime
from pathlib import Path
from typing import Dict
SCRIPT_DIR = Path(__file__).parent.resolve()
def sh(*args: str) -> str:
out = subprocess.check_output(list(args))
return out.strip().decode("utf-8")
def prefetch_github(owner: str, repo: str, ref: str) -> str:
return sh(
"nix-prefetch-url",
"--unpack",
f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz",
)
def get_radare2_rev() -> str:
feed_url = "https://github.com/radareorg/radare2/releases.atom"
with urllib.request.urlopen(feed_url) as resp:
tree = ET.fromstring(resp.read())
releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry")
for release in releases:
link = release.find("{http://www.w3.org/2005/Atom}link")
assert link is not None
url = urlparse(link.attrib["href"])
tag = url.path.split("/")[-1]
if re.match(r"[0-9.]+", tag):
return tag
else:
print(f"ignore {tag}")
raise RuntimeError(f"No release found at {feed_url}")
def git(dirname: str, *args: str) -> str:
return sh("git", "-C", dirname, *args)
def get_repo_info(dirname: str, rev: str) -> Dict[str, str]:
sha256 = prefetch_github("radare", "radare2", rev)
return dict(
rev=rev,
sha256=sha256,
version_commit=git(dirname, "rev-list", "--all", "--count"),
gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"),
gittip=git(dirname, "rev-parse", "HEAD"),
)
def main() -> None:
version = get_radare2_rev()
with tempfile.TemporaryDirectory() as dirname:
git(
dirname,
"clone",
"--branch",
version,
"https://github.com/radare/radare2",
".",
)
nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
info = get_repo_info(dirname, version)
timestamp = git(dirname, "log", "-n1", "--format=%at")
in_block = False
with fileinput.FileInput(nix_file, inplace=True) as f:
for l in f:
if "#<generated>" in l:
in_block = True
print(
f""" #<generated>
# DO NOT EDIT! Automatically generated by ./update.py
gittap = "{info["gittap"]}";
gittip = "{info["gittip"]}";
rev = "{info["rev"]}";
version = "{version}";
sha256 = "{info["sha256"]}";
#</generated>"""
)
elif "#</generated>" in l:
in_block = False
elif not in_block:
print(l, end="")
if __name__ == "__main__":
main()

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.1.28";
version = "0.1.29";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UssjIix2sFLqau5PMFNDP9XPCSNUdRO6aBixIQNtSy8=";
sha256 = "sha256-RPlEFajIjEBKdL97xjQP6r3AAcCQlxw2Il8nkSjxa+k=";
};
vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q=";

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "70fd2cba742506903589b5e046c32e0e3e06404a",
"date": "2021-03-03T17:18:54-08:00",
"path": "/nix/store/m0pzbb0vg0fm9nycj05ay0yldzp7qwbi-tree-sitter-c-sharp",
"sha256": "12jj66rsn1klsk24yj0ymgsqwy7lc5kb3nkj7griip8rmi3kgy41",
"rev": "09749b7b5428e770cc2ebdf2e90029c0f4a2d411",
"date": "2021-04-13T07:05:48+01:00",
"path": "/nix/store/w99nivk866bglvijxb5m0c789qh99x1m-tree-sitter-c-sharp",
"sha256": "17n7r1j1ib3gzjf0qw88512flzamjrvilksbf1p15dqa17rmwyq1",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
"rev": "5aa0bbbfc41868a3727b7a89a90e9f52e0964b2b",
"date": "2021-03-03T17:00:36-08:00",
"path": "/nix/store/2wa64ii39p31wpngvqk4ni8z8ws29r2g-tree-sitter-c",
"sha256": "1diys8yigvhm4ppbmp3a473yxjg2d5lk11y0ay7qprcz7233lakv",
"rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae",
"date": "2021-03-28T09:12:10-07:00",
"path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c",
"sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
"rev": "05cf2030e5415e9e931f620f0924107f73976796",
"date": "2021-03-04T10:01:34-08:00",
"path": "/nix/store/fraya34acwl9i3cxpml9hwzfkyc8vs89-tree-sitter-cpp",
"sha256": "08ywv6n80sa541rr08bqz4zyg7byvjcabp68lvxmcahjk8xzcgwk",
"rev": "c61212414a3e95b5f7507f98e83de1d638044adc",
"date": "2021-03-27T10:08:51-07:00",
"path": "/nix/store/a8cd3sv1j900sd8l7cdjw91iw7pp3jhv-tree-sitter-cpp",
"sha256": "04nv9j03q20idk9pnm2lgw7rbwzy5jf9v0y6l102by68z4lv79fi",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/travonted/tree-sitter-fennel",
"rev": "5aad9d1f490b7fc8a847a5b260f23396c56024f5",
"date": "2020-11-03T09:22:17-05:00",
"path": "/nix/store/gsxg67brk198201h70lip7miwny084sy-tree-sitter-fennel",
"sha256": "1imv5nwmhsyxwq7b9z4qz72lfva40wgybdkmq0gbbfbszl9a9bgl",
"rev": "bc689e2ef264e2cba499cfdcd16194e8f5fe87d2",
"date": "2021-03-09T16:47:45-05:00",
"path": "/nix/store/3h4j1mrqvn0ybqjalic92bnhk7c15442-tree-sitter-fennel",
"sha256": "1jm21bmsdrz9x5skqmx433q9b4mfi88gzc4la5hqps4is28inqms",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
"rev": "e41dd569d91eb58725baa7089c34fc3d785b2978",
"date": "2021-03-03T17:11:05-08:00",
"path": "/nix/store/87n5nl5p1fnmwgy0zshz90vyvha6b7mn-tree-sitter-go",
"sha256": "0nxs47vd2fc2fr0qlxq496y852rwg39flhg334s7dlyq7d3lcx4x",
"rev": "2a83dfdd759a632651f852aa4dc0af2525fae5cd",
"date": "2021-03-09T16:11:33-05:00",
"path": "/nix/store/2jk1bacllxsii8nlbc5lyi3k376ylf3q-tree-sitter-go",
"sha256": "001p8kb8g4vghn78690bnav42inkypld2k1mbd5pbmd5svvacfav",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "24cf84ff618e96528882c67c8740fadcd6c4a921",
"date": "2021-03-06T17:58:27+01:00",
"path": "/nix/store/46hpbz06d1p5n0rp6z3iwy2lpwrn8kgl-tree-sitter-haskell",
"sha256": "1l004x1z9g1p8313ipvrf581vr2wi82qcwc0281kg083m2z4535p",
"rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b",
"date": "2021-04-19T23:45:03+02:00",
"path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell",
"sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
"rev": "7ad106e81963b4d5c0aff99b93d16dc577fa3bc8",
"date": "2021-03-05T16:03:00-08:00",
"path": "/nix/store/ax9m7v0pv7q7xsnrjlfdpljs4f6xi2z3-tree-sitter-java",
"sha256": "1594mrhqcdfs8b7wmwpzcwna4m3ra8cbzq162flwrhcsb3w0rr9w",
"rev": "ee8e358637e05188f9f65d8d1ad88a4412c975ce",
"date": "2021-04-20T10:40:14-04:00",
"path": "/nix/store/8612qackwqdsvbfc03lzc5vds6mvqwxf-tree-sitter-java",
"sha256": "19qxfimy8w49gqc97siknd27kvkz73qp2v2118pvdbdz7c5dv27r",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "b3e7667995c065be724d10b69fbc3d0177ccef0b",
"date": "2021-03-08T13:12:59-08:00",
"path": "/nix/store/1y3nirw7bbnld4qy7ysm20bq0x9403wz-tree-sitter-javascript",
"sha256": "0bzyq5x8x1r34fzy1f05yqdlz51b1i1jmyssm0i571n9n6142s3j",
"rev": "a263a8f53266f8f0e47e21598e488f0ef365a085",
"date": "2021-04-20T10:37:09-04:00",
"path": "/nix/store/y6qbdzdx4g1g1sa2rb7dnk9snjs6lhpp-tree-sitter-javascript",
"sha256": "04s1jb9c96kwq0nrh6516idlh58d2b1k66amqa2sl5kk32pl9pmm",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
"rev": "89607925e8989f2638cc935b8de7e44ac3c91907",
"date": "2021-03-04T14:55:58-08:00",
"path": "/nix/store/xpykb8mr4xarh6finzkz71z2bpqm8k26-tree-sitter-json",
"sha256": "06pjh31bv9ja9hlnykk257a6zh8bsxg2fqa54al7qk1r4n9ksnff",
"rev": "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb",
"date": "2021-03-09T16:25:11-05:00",
"path": "/nix/store/bn5smxwwg4zzdc52wp2qb6s6yjdfi8mg-tree-sitter-json",
"sha256": "13p4ffmajirl9qh64d6qnng1gjnh5f6jkqbra0nlc1260nsf12hp",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ikatyang/tree-sitter-markdown",
"rev": "5a139bed455268a06410471bf48b19d11abdd367",
"date": "2021-01-24T15:17:18+08:00",
"path": "/nix/store/125cbxcqvwyq8b7kvmg7wxjjz16s2jvw-tree-sitter-markdown",
"sha256": "072b4nnpymrh90y4dk18kr8l1g7m83r3gvp6v0ad9f9dnq47fgax",
"rev": "8b8b77af0493e26d378135a3e7f5ae25b555b375",
"date": "2021-04-18T20:49:21+08:00",
"path": "/nix/store/4z2k0q6rwqmb7vbqr4vgc26w28szlan3-tree-sitter-markdown",
"sha256": "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
"rev": "a6bae0619126d70c756c11e404d8f4ad5108242f",
"date": "2021-02-09T00:48:18-06:00",
"path": "/nix/store/1rfsi62v549h72vw7ysciaw17vr5h9yx-tree-sitter-nix",
"sha256": "08n496k0vn7c2751gywl1v40490azlri7c92dr2wfgw5jxhjmb0d",
"rev": "d5287aac195ab06da4fe64ccf93a76ce7c918445",
"date": "2021-04-21T19:11:29-05:00",
"path": "/nix/store/6labzn2qd3wyn4k2ddb09z2avpgqwbp1-tree-sitter-nix",
"sha256": "0mapqdqrinskdxlarrrvyd55mjg97gbd6jm9vbjmdm4xi2hhzvxa",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ocaml",
"rev": "19a8d2aab425c4c4c8dc6a882e67c37010620c3b",
"date": "2021-03-08T16:57:09-08:00",
"path": "/nix/store/y8jsf6vp278svqm4c6xnl4i6vanslrkk-tree-sitter-ocaml",
"sha256": "0c5wjanka87bhha0aq3m5p448apxhv8hndlqvhly6qafj99jp85i",
"rev": "2f962cf4eb0bee87bba755347a79ee501cd58313",
"date": "2021-03-11T02:13:42+01:00",
"path": "/nix/store/pwf6di3pdghsnb83c87vvm3w0d5aanvp-tree-sitter-ocaml",
"sha256": "1dfan7kbs7i0nz9dkxv8ipn0b341j1fr9fn0a2zfqsx6xxkra56r",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "ba231f9844e5a1bf60e1cb72c34c0a431239585a",
"date": "2021-03-03T17:17:11-08:00",
"path": "/nix/store/cn06h14pgq3psjq3ms0yvdm3x1wwbc1j-tree-sitter-php",
"sha256": "1xaml64b7cx3hn6x35bbgar8cp7ccxkwvxddjdvyj5nzfx1id8y3",
"rev": "4dcc061668fbc68b79421c72eb8a8baeeb0f3693",
"date": "2021-04-19T12:44:47-04:00",
"path": "/nix/store/2i80zds4dbynrdim9ngc8yp6yn825byb-tree-sitter-php",
"sha256": "0hs6dfw9n6sp7vbp7zfid0f0sxydyya3dyp5ghckz7al069g3vx2",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
"rev": "dd98afca32aaceff9025f9e85031ac50bee8b08b",
"date": "2021-03-05T16:00:15-08:00",
"path": "/nix/store/6sbmzgva73fhgqhsdrg5zy7vbs9lzll9-tree-sitter-python",
"sha256": "01ykryrv1nn2y8dcbl64d31h1ipz2569ywzjp10pd93h1s6czpnl",
"rev": "d6210ceab11e8d812d4ab59c07c81458ec6e5184",
"date": "2021-03-27T09:41:53-07:00",
"path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python",
"sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
"rev": "20f064bd758f94b8f47ce5a21e4383c7349ca182",
"date": "2021-03-04T14:06:14-08:00",
"path": "/nix/store/za0yxqjjp9vxgwrp014qwv2v2qffl0di-tree-sitter-rust",
"sha256": "118vkhv7n3sw8y9pi0987cgdcd74sjqwviijw01mhnk3bkyczi3l",
"rev": "a360da0a29a19c281d08295a35ecd0544d2da211",
"date": "2021-03-27T09:50:22-07:00",
"path": "/nix/store/h4snh879ccy159fa390qr8l0nyaf5ndr-tree-sitter-rust",
"sha256": "0knaza3ww5h5w95hzdaalg5yrfpiv0r394q0imadxp5611132hxz",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
"rev": "262797b1dfe0303818c2418c0a88f6be65f37245",
"date": "2021-03-04T15:02:28-08:00",
"path": "/nix/store/vc5fr00vqx5nf17r9grdwb11wci3xrkm-tree-sitter-scala",
"sha256": "1zf3b1x1s94dgzjbc6l8ind5fd1mmny3893d4bqc63h4qp0n0bp3",
"rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29",
"date": "2021-04-01T10:11:15-07:00",
"path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala",
"sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
"rev": "a96899bd1ab6a18e3837f232fd688af69e3a8071",
"date": "2021-03-09T15:14:24+05:30",
"path": "/nix/store/nlpf6gilkk19aw7pk1kbys2alhnqagqj-tree-sitter-svelte",
"sha256": "04virfsiqqhh3gc3cmcjd4s1zn9wdxi47m55x938napaqiaw29nx",
"rev": "c696a13a587b0595baf7998f1fb9e95c42750263",
"date": "2021-03-20T16:45:11+05:30",
"path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",
"sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
"rev": "7e119621b1d2ab1873ba14d8702f62458df70409",
"date": "2021-03-08T13:23:30-08:00",
"path": "/nix/store/k7vam1w5c2r0hhxy0bgpmj65bw5wnh96-tree-sitter-typescript",
"sha256": "1fv6q1bc0j6b89skz7x2ibi6bxx0ijrb676y23aahycvz2p8x4z0",
"rev": "82916165120f840164f11119f268a4de819ea90b",
"date": "2021-04-19T18:16:19-07:00",
"path": "/nix/store/0c0kkiiamms3yl3mf1clyrqcjwp5j920-tree-sitter-typescript",
"sha256": "1jnf0hn6hmn4x2cvy29mk8g1wlp0afs8immp461by3q5hcq8fzb4",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-verilog",
"rev": "ad551aae2649da56582bc0557478a7dc979c0be3",
"date": "2020-10-13T17:40:47-07:00",
"path": "/nix/store/nfaxfqrqkxpwaq8rnk7kcp28nnj8y6m2-tree-sitter-verilog",
"sha256": "0cy29i200rnc34d237s19r6a1n5vv4d3wgwpbywxg6ahcankc34m",
"rev": "1b624ab8b3f8d54ecc37847aa04512844f0226ac",
"date": "2021-03-31T21:27:26-07:00",
"path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog",
"sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/ikatyang/tree-sitter-yaml",
"rev": "ab0ce67ce98f8d9cc0224ebab49c64d01fedc1a1",
"date": "2021-01-01T21:13:43+08:00",
"path": "/nix/store/3vnhqr4l2hb0ank13avj8af4qbni5szw-tree-sitter-yaml",
"sha256": "14f0abv68cjkwdcjjwa1nzjpwp6w59cj5v4m5h5h3jxi96z65459",
"rev": "6129a83eeec7d6070b1c0567ec7ce3509ead607c",
"date": "2021-04-18T14:25:59+08:00",
"path": "/nix/store/8wrwm71z9flfk00phrh9aaxpvsrw1m67-tree-sitter-yaml",
"sha256": "1bimf5fq85wn8dwlk665w15n2bj37fma5rsfxrph3i9yb0lvzi3q",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -827,8 +827,8 @@ let
mktplcRef = {
name = "scala";
publisher = "scala-lang";
version = "0.5.1";
sha256 = "0p9nhds2xn08xz8x822q15jdrdlqkg2wa1y7mk9k89n8n2kfh91g";
version = "0.5.3";
sha256 = "0isw8jh845hj2fw7my1i19b710v3m5qsjy2faydb529ssdqv463p";
};
meta = {
license = lib.licenses.mit;
@ -839,8 +839,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.9.13";
sha256 = "0vrg25ygmyjx1lwif2ypyv688b290ycfn1qf0izxbmgi2z3f0wf9";
version = "1.10.3";
sha256 = "0m4qm1z1j6gfqjjnxl8v48ga7zkaspjy3gcnkrch3aj4fyafjl09";
};
meta = {
license = lib.licenses.asl20;

View file

@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
description = "Firmware for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/firmware";
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
maintainers = with maintainers; [ dezgeg tavyc ];
maintainers = with maintainers; [ dezgeg ];
};
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.11.15";
version = "5.11.16";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-Qhq01SgLeNbts86DLi/t70HJfJPmM1So1C4eqVyRLK0=";
sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q=";
extraPostFetch = ''
rm $out/.config
'';

View file

@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.nongnu.org/quagga/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ tavyc ];
maintainers = with maintainers; [ ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
version = "4.0.4";
version = "4.0.5";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE=";
sha256 = "sha256-tpk5Avx2bRQlhOnHpmpDG14X9nk3x68TST+VtIW8rL8=";
};
vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs=";
vendorSha256 = "sha256-O9SEVyBFnmyrQCmccXLyeOqlTwWHzICTLVKGO7rerjI=";
doCheck = false;

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnsx";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "v${version}";
sha256 = "sha256-CjWFXYU34PE4I9xihQbPxVcxLyiMCYueuaB/LaXhHQg=";
sha256 = "sha256-k71Pw6XdOFMUf7w7QAAxqQkmkCINl+3KApkIPRyAQLM=";
};
vendorSha256 = "sha256-vTXvlpXpFf78Cwxq/y6ysSeXM3g71kHBn9zd6c4mxlk=";
vendorSha256 = "sha256-YA0XZSXmpAcNEFutrBbQE8DN7v5hcva0fscemEMLewU=";
meta = with lib; {
description = "Fast and multi-purpose DNS toolkit";

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
version = "0.9.0";
version = "0.10.2";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-X67TEHKmKKuTFGo55ZVkYVNw4f/d8aU2b/FQsq1OIJg=";
sha256 = "sha256-kKzrV2TTO8NmB3x27ZStMZpSIRGwm5Ev+cPGwT50FEU=";
};
vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
vendorSha256 = "sha256-PC2n6+gPDxpG8RTAmCfK4P40yfxqlleYI6Ex4FtPjk4=";
propagatedBuildInputs = [ docker ];

View file

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
}:
buildGoModule {
pname = "zoekt";
version = "unstable-2021-03-17";
src = fetchFromGitHub {
owner = "google";
repo = "zoekt";
rev = "d92b3b80e582e735b2459413ee7d9dbbf294d629";
sha256 = "JdORh6bRdHsAYwsmdKY0OUavXfu3HsPQFkQjRBkcMBo=";
};
vendorSha256 = "d+Xvl6fleMO0frP9qr5tZgkzsnH5lPELwmEQEspD22M=";
checkInputs = [
git
];
meta = with lib; {
description = "Fast trigram based code search";
homepage = "https://github.com/google/zoekt";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -4171,6 +4171,8 @@ in
zeek = callPackage ../applications/networking/ids/zeek { };
zoekt = callPackage ../tools/text/zoekt { };
zoxide = callPackage ../tools/misc/zoxide { };
zzuf = callPackage ../tools/security/zzuf { };

View file

@ -3513,6 +3513,8 @@ in {
karton-core = callPackage ../development/python-modules/karton-core { };
karton-dashboard = callPackage ../development/python-modules/karton-dashboard { };
karton-mwdb-reporter = callPackage ../development/python-modules/karton-mwdb-reporter { };
karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { };
@ -3688,6 +3690,10 @@ in {
liblarch = callPackage ../development/python-modules/liblarch { };
liblzfse = callPackage ../development/python-modules/liblzfse {
inherit (pkgs) lzfse;
};
libmodulemd = pipe pkgs.libmodulemd [
toPythonModule
(p: