Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-23 00:15:39 +00:00 committed by GitHub
commit 481a9bc47c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 967 additions and 204 deletions

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "myxer";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "Aurailus";
repo = pname;
rev = version;
sha256 = "10m5qkys96n4v6qiffdiy0w660yq7b5sa70ww2zskc8d0gbmxp6x";
sha256 = "0bnhpzmx4yyasv0j7bp31q6jm20p0qwcia5bzmpkz1jhnc27ngix";
};
cargoSha256 = "0nsscdjl5fh24sg87vdmijjmlihc0zk0p3vac701v60xlz55qipn";
cargoSha256 = "1cyh0nk627sgyr78rcnhj7af5jcahvjkiv5sz7xwqfdhvx5kqsk5";
nativeBuildInputs = [ pkg-config ];

View file

@ -51,6 +51,18 @@ let
meta.homepage = "https://github.com/andreyorst/fzf.kak/";
};
kakboard = buildKakounePluginFrom2Nix {
pname = "kakboard";
version = "2020-05-09";
src = fetchFromGitHub {
owner = "lePerdu";
repo = "kakboard";
rev = "2f13f5cd99591b76ad5cba230815b80138825120";
sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd";
};
meta.homepage = "https://github.com/lePerdu/kakboard/";
};
kakoune-buffer-switcher = buildKakounePluginFrom2Nix {
pname = "kakoune-buffer-switcher";
version = "2020-12-27";

View file

@ -12,6 +12,7 @@ greenfork/active-window.kak
kakoune-editor/kakoune-extra-filetypes
kakounedotcom/connect.kak
kakounedotcom/prelude.kak
lePerdu/kakboard
listentolist/kakoune-rainbow
mayjs/openscad.kak
occivink/kakoune-buffer-switcher

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.82.0";
version = "0.82.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D0bwy8LJihlfM+E3oys85yjadjZNfPv5xnq4ekaZPCU=";
sha256 = "sha256-6poWFcApwCos3XvS/Wq1VJyf5xTUWtqWNFXIhjNsXVs=";
};
vendorSha256 = "sha256-pJBm+yyy1DbH28oVBQA+PHSDtSg3RcgbRlurrwnnEls=";

View file

@ -57,9 +57,8 @@ stdenv.mkDerivation rec {
pkg-config
python3Packages.sphinx
removeReferencesTo
(if i3Support || i3GapsSupport then makeWrapper else null)
];
]
++ lib.optional (i3Support || i3GapsSupport) makeWrapper;
buildInputs = [
cairo
@ -75,19 +74,16 @@ stdenv.mkDerivation rec {
xcbutilrenderutil
xcbutilwm
xcbutilxrm
(if alsaSupport then alsaLib else null)
(if githubSupport then curl else null)
(if mpdSupport then libmpdclient else null)
(if pulseSupport then libpulseaudio else null)
(if iwSupport then wirelesstools else null)
(if nlSupport then libnl else null)
(if i3Support || i3GapsSupport then jsoncpp else null)
(if i3Support then i3 else null)
(if i3GapsSupport then i3-gaps else null)
];
]
++ lib.optional alsaSupport alsaLib
++ lib.optional githubSupport curl
++ lib.optional mpdSupport libmpdclient
++ lib.optional pulseSupport libpulseaudio
++ lib.optional iwSupport wirelesstools
++ lib.optional nlSupport libnl
++ lib.optional (i3Support || i3GapsSupport) jsoncpp
++ lib.optional i3Support i3
++ lib.optional i3GapsSupport i3-gaps;
postInstall = if i3Support
then ''wrapProgram $out/bin/polybar \

View file

@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.3.0";
version = "2.3.1";
nativeBuildInputs = [
cmake
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5";
sha256 = "1lyaxc9nha1cd8p35iam1k1pikp9kfx0fj1l6vb1xb8pgqp02jnn";
rev = "version_${version}";
};

View file

@ -1,12 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, pkg-config
, which
, bison
, gnuplot
, libxls
, libxlsxwriter
, libxml2
, libzip
, ncurses
@ -25,6 +27,18 @@ stdenv.mkDerivation rec {
sourceRoot = "${src.name}/src";
patches = [
# libxls and libxlsxwriter are not found without the patch
# https://github.com/andmarti1424/sc-im/pull/542
(fetchpatch {
name = "use-pkg-config-for-libxls-and-libxlsxwriter.patch";
url = "https://github.com/andmarti1424/sc-im/commit/b62dc25eb808e18a8ab7ee7d8eb290e34efeb075.patch";
sha256 = "1yn32ps74ngzg3rbkqf8dn0g19jv4xhxrfgx9agnywf0x8gbwjh3";
})
];
patchFlags = [ "-p2" ];
nativeBuildInputs = [
makeWrapper
pkg-config
@ -35,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnuplot
libxls
libxlsxwriter
libxml2
libzip
ncurses

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "xplr";
version = "0.5.4";
version = "0.5.5";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = name;
rev = "v${version}";
sha256 = "0m28jhkvz46psxbv8g34v34m1znvj51gqizaxlmxbgh9fj3vyfdb";
sha256 = "06n1f4ccvy3bpw0js164rjclp0qy72mwdqm5hmvnpws6ixv78biw";
};
cargoSha256 = "0q2k8bs32vxqbnjdh674waagpzpb9rxlwi4nggqlbzcmbqsy8n6k";
cargoSha256 = "0n9sgvqb194s5bzacr7dqw9cy4z9d63wzcxr19pv9pxpafjwlh0z";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

View file

@ -18,15 +18,15 @@
}
},
"beta": {
"version": "90.0.4430.85",
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
"sha256bin64": "0aw76phm8r9k2zlqywyggzdqa467c8naqa717m24dk3nvv2rfkg2",
"version": "91.0.4472.19",
"sha256": "0p51cxz0dm9ss9k7b91c0nd560mgi2x4qdcpg12vdf8x24agai5x",
"sha256bin64": "0pf0sw8sskv4x057w7l6jh86q5mdvm800iikzy6fvambhh7bvd1i",
"deps": {
"gn": {
"version": "2021-02-09",
"version": "2021-04-06",
"url": "https://gn.googlesource.com/gn",
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
}
}
},

View file

@ -257,7 +257,7 @@ let
makeWrapper "$oldExe" \
"$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
--suffix LD_LIBRARY_PATH ':' "$libs" \
--prefix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--prefix PATH ':' "${xdg-utils}/bin" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \

View file

@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.0.0";
version = "3.0.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-TbNqwTVND09WzUH8ZH7YFRwcHV8eX1G0FXtZJi67Sk4=";
sha256 = "sha256-+LuBz58hTzi/hGwqX/0VMNYn/+SRYgnNefn3B3i7eEs=";
};
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";
@ -46,10 +46,11 @@ buildGoModule rec {
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/argoproj/argo.version=${version}
-X github.com/argoproj/argo.gitCommit=${src.rev}
-X github.com/argoproj/argo.gitTreeState=clean
-X github.com/argoproj/argo.gitTag=${version}
-X github.com/argoproj/argo-workflows/v3.buildDate=unknown
-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}
-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}
-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean
-X github.com/argoproj/argo-workflows/v3.version=${version}
'';
postInstall = ''

View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.12.9.1";
version = "2.13.0.1";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-B3ko+RNT+LYSJG1P5cujgRMc1OJhDPqm1ONrMh+7fI4=";
sha256 = "sha256-auU49XeFxXAacBEszwB6tVU6vTMq4t6q2vVk9AHHNK0=";
};
postPatch = ''

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3wsr";
version = "1.3.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "roosta";
repo = pname;
rev = "v${version}";
sha256 = "1zpyncg29y8cv5nw0vgd69nywbj1ppxf6qfm4zc6zz0gk0vxy4pn";
sha256 = "sha256-PluczllPRlfzoM2y552YJirrX5RQZQAkBQkner7fWhU=";
};
cargoSha256 = "0snys419d32anf73jcvrq8h9kp1fq0maqcxz6ww04yg2jv6j47nc";
cargoSha256 = "sha256-GwRiyAHTcRoByxUViXSwslb+IAP6LK8IWZ0xICQ8qag=";
nativeBuildInputs = [ python3 ];
buildInputs = [ libxcb ];

View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
stdenv.mkDerivation rec {
pname = "BeautyLine";
version = "0.0.1";
src = fetchzip {
name = "${pname}-${version}";
url = "https://github.com/gvolpe/BeautyLine/releases/download/${version}/BeautyLine.tar.gz";
sha256 = "030bjk333fr9wm1nc740q8i31rfsgf3vg6cvz36xnvavx3q363l7";
};
nativeBuildInputs = [ gtk3 ];
# ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point)
propagatedBuildInputs = [
breeze-icons
gnome-icon-theme
hicolor-icon-theme
mint-x-icons
pantheon.elementary-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons/${pname}
cp -r * $out/share/icons/${pname}/
gtk-update-icon-cache $out/share/icons/${pname}
'';
meta = with lib; {
description = "BeautyLine icon theme";
homepage = "https://www.gnome-look.org/p/1425426/";
platforms = platforms.linux;
license = [ licenses.publicDomain ];
maintainers = with maintainers; [ gvolpe ];
};
}

View file

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "4.8.4";
version = "4.8.6";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-OOPjxYrYUd1PIRxRgHwYbm7ennmAChbXqcM8MEPKXO0=";
hash = "sha256-OUv7l+klu5l1Y7m+iHiq/dDyxH3/hT4k7F9gDuUiGds=";
};
outputs = [ "out" "dev" ];

View file

@ -1,19 +1,34 @@
{ jdk
, runCommand
, patchelf
{ stdenv
, jdk
, lib
, modules ? [ "java.base" ]
}:
let
jre = runCommand "${jdk.name}-jre" {
nativeBuildInputs = [ patchelf ];
jre = stdenv.mkDerivation {
name = "${jdk.name}-minimal-jre";
version = jdk.version;
buildInputs = [ jdk ];
dontUnpack = true;
# Strip more heavily than the default '-S', since if you're
# using this derivation you probably care about this.
stripDebugFlags = [ "--strip-unneeded" ];
buildPhase = ''
runHook preBuild
jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
runHook postBuild
'';
dontInstall = true;
passthru = {
home = "${jre}";
};
} ''
jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out
patchelf --shrink-rpath $out/bin/* $out/lib/jexec $out/lib/jspawnhelper $out/lib/*.so $out/lib/*/*.so
'';
};
in jre

View file

@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.3.1";
version = "0.3.5";
reflectionJson = fetchurl {
name = "reflection.json";
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
sha256 = "0ar2ry07axgrmdb6nsc0786v1a1nwlyvapgxncaaympvn38qk8qf";
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
sha256 = "sha256-TVFdGFXclJE9GpolKzTGSmeianBdb2Yp3kbNUWlddPw=";
};
src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "1fapkyq7fcgydy8sls6jzxagfkhgxhwp1rdvjqxdmqk4d82jwrh2";
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-tOLT5W5kK38fb9XL9jOQpw0LjHPjbn+BarckbCuwQAc=";
};
dontUnpack = true;

View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, minizip
, python3
, zlib
}:
stdenv.mkDerivation rec {
pname = "libxlsxwriter";
version = "1.0.3";
src = fetchFromGitHub {
owner = "jmcnamara";
repo = "libxlsxwriter";
rev = "RELEASE_${version}";
sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv";
};
nativeBuildInputs = [
python3.pkgs.pytest
];
buildInputs = [
minizip
zlib
];
makeFlags = [
"PREFIX=${placeholder "out"}"
"USE_SYSTEM_MINIZIP=1"
];
doCheck = true;
checkTarget = "test";
meta = with lib; {
description = "C library for creating Excel XLSX files";
homepage = "https://libxlsxwriter.github.io/";
changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt";
license = licenses.bsd2;
maintainers = with maintainers; [ dotlambda ];
platforms = platforms.unix;
};
}

View file

@ -1,7 +1,7 @@
{ stdenv
, lib
{ lib
, buildPythonPackage
, capstone
, stdenv
, fetchpatch
, fetchPypi
, setuptools
@ -33,5 +33,7 @@ buildPythonPackage rec {
license = licenses.bsdOriginal;
description = "Python bindings for Capstone disassembly engine";
maintainers = with maintainers; [ bennofs ris ];
# creates a manylinux2014-x86_64 wheel
broken = stdenv.isAarch64;
};
}

View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, chardet
, attrs
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "debut";
version = "0.9.9";
src = fetchPypi {
inherit pname version;
sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1";
};
dontConfigure = true;
propagatedBuildInputs = [
chardet
attrs
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"debut"
];
meta = with lib; {
description = "Python library to parse Debian deb822-style control and copyright files ";
homepage = "https://github.com/nexB/debut";
license = with licenses; [ asl20 bsd3 mit ];
maintainers = teams.determinatesystems.members;
};
}

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "omnilogic";
version = "0.4.3";
version = "0.4.5";
src = fetchFromGitHub {
owner = "djtimca";
repo = "omnilogic-api";
rev = "v${version}";
sha256 = "19pmbykq0mckk23aj33xbhg3gjx557xy9a481mp6pkmihf2lsc8z";
rev = version;
sha256 = "081awb0fl40b5ighc9yxfq1xkgxz7l5dvz5544hx965q2r20wvsg";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, oauthlib
, pythonOlder
, requests
, requests_oauthlib
}:
buildPythonPackage rec {
pname = "ondilo";
version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "JeromeHXP";
repo = pname;
rev = version;
sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b";
};
propagatedBuildInputs = [
oauthlib
requests
requests_oauthlib
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "ondilo" ];
meta = with lib; {
description = "Python package to access Ondilo ICO APIs";
homepage = "https://github.com/JeromeHXP/ondilo";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, ssdeep
, pefile
}:
buildPythonPackage rec {
pname = "pyimpfuzzy";
version = "0.5";
src = fetchPypi {
inherit pname version;
sha256 = "da9796df302db4b04a197128637f84988f1882f1e08fdd69bbf9fdc6cfbaf349";
};
buildInputs = [
ssdeep
];
propagatedBuildInputs = [
pefile
];
# no tests
doCheck = false;
pythonImportsCheck = [
"pyimpfuzzy"
];
meta = with lib; {
description = "A Python module which calculates and compares the impfuzzy (import fuzzy hashing)";
homepage = "https://github.com/JPCERTCC/impfuzzy";
license = licenses.gpl2Only;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
}:
buildPythonPackage rec {
pname = "pymdstat";
version = "0.4.2";
src = fetchFromGitHub {
owner = "nicolargo";
repo = pname;
rev = "v${version}";
sha256 = "01hj8vyd9f7610sqvzphpr033rvnazbwvl11gi18ia3yqlnlncp0";
};
checkPhase = ''
${python.interpreter} $src/unitest.py
'';
pythonImportsCheck = [ "pymdstat" ];
meta = with lib; {
description = "A pythonic library to parse Linux /proc/mdstat file";
homepage = "https://github.com/nicolargo/pymdstat";
maintainers = with maintainers; [ rhoriguchi ];
license = licenses.mit;
};
}

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, future
, pytestCheckHook
, mock
}:
buildPythonPackage rec {
pname = "pysmart-smartx";
version = "0.3.10";
src = fetchFromGitHub {
owner = "smartxworks";
repo = "pySMART";
rev = "v${version}";
sha256 = "1irl4nlgz3ds3aikraa9928gzn6hz8chfh7jnpmq2q7d2vqbdrjs";
};
propagatedBuildInputs = [ future ];
# tests require contextlib.nested
doCheck = !isPy3k;
checkInputs = [ pytestCheckHook mock ];
pythonImportsCheck = [ "pySMART" ];
meta = with lib; {
description = "It's a fork of pySMART with lots of bug fix and enhances";
homepage = "https://github.com/smartxworks/pySMART";
maintainers = with maintainers; [ rhoriguchi ];
license = licenses.gpl2Only;
};
}

View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, enum-compat
, unicodecsv
}:
buildPythonPackage rec {
pname = "python-registry";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "99185f67d5601be3e7843e55902d5769aea1740869b0882f34ff1bd4b43b1eb2";
};
propagatedBuildInputs = [
enum-compat
unicodecsv
];
# no tests
doCheck = false;
pythonImportsCheck = [
"Registry"
];
meta = with lib; {
description = "Pure Python parser for Windows Registry hives";
homepage = "https://github.com/williballenthin/python-registry";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, capstone
, unicorn
, pefile
, python-registry
, keystone-engine
, pyelftools
, gevent
}:
buildPythonPackage rec {
pname = "qiling";
version = "1.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "e3ed09f9e080559e73e2a9199649b934b3594f653079d1e7da4992340c19eb64";
};
propagatedBuildInputs = [
capstone
unicorn
pefile
python-registry
keystone-engine
pyelftools
gevent
];
# Tests are broken (attempt to import a file that tells you not to import it,
# amongst other things)
doCheck = false;
pythonImportsCheck = [
"qiling"
];
meta = with lib; {
description = "Qiling Advanced Binary Emulation Framework";
homepage = "https://qiling.io/";
license = licenses.gpl2Only;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
}:
buildPythonPackage rec {
pname = "requirements-parser";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4";
};
checkInputs = [
nose
];
checkPhase = ''
nosetests
'';
pythonImportsCheck = [
"requirements"
];
meta = with lib; {
description = "A Pip requirements file parser";
homepage = "https://github.com/davidfischer/requirements-parser";
license = licenses.bsd2;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -1,24 +1,31 @@
{ lib
, buildPythonPackage
, construct
, fetchPypi
, fetchFromGitHub
, isPy3k
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "snapcast";
version = "2.1.2";
version = "2.1.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ILBleqxEO7wTxAw/fvDW+4O4H4XWV5m5WWtaNeRBr4g=";
src = fetchFromGitHub {
owner = "happyleavesaoc";
repo = "python-snapcast";
rev = version;
sha256 = "1jigdccdd7bffszim942mxcwxyznfjx7y3r5yklz3psl7zgbzd6c";
};
propagatedBuildInputs = [ construct ];
propagatedBuildInputs = [
construct
];
checkInputs = [
pytestCheckHook
];
# no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
doCheck = false;
pythonImportsCheck = [ "snapcast" ];
meta = with lib; {

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, future
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sparklines";
version = "0.4.2";
src = fetchFromGitHub {
owner = "deeplook";
repo = pname;
rev = "v${version}";
sha256 = "1hfxp5c4wbyddy7fgmnda819w3dia3i6gqb2323dr2z016p84r7l";
};
propagatedBuildInputs = [ future ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "sparklines" ];
meta = with lib; {
description = "This Python package implements Edward Tufte's concept of sparklines, but limited to text only";
homepage = "https://github.com/deeplook/sparklines";
maintainers = with maintainers; [ rhoriguchi ];
license = licenses.gpl3Only;
};
}

View file

@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchPypi
, pyyaml
, docker
, dockerfile-parse
, requests
, stevedore
, pbr
, debut
, regex
, GitPython
, prettytable
, idna
}:
buildPythonPackage rec {
pname = "tern";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727";
};
preBuild = ''
cp requirements.{in,txt}
'';
nativeBuildInputs = [
pbr
];
propagatedBuildInputs = [
pyyaml
docker
dockerfile-parse
requests
stevedore
debut
regex
GitPython
prettytable
idna
];
# No tests
doCheck = false;
pythonImportsCheck = [
"tern"
];
meta = with lib; {
description = "A software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles";
homepage = "https://github.com/tern-tools/tern";
license = licenses.bsd2;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "clj-kondo";
version = "2021.02.13";
version = "2021.03.31";
reflectionJson = fetchurl {
name = "reflection.json";
url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json";
sha256 = "ea5c18586fd8803b138a4dd197a0019d5e5a2c76ebe4925b9b54a10125a68c57";
url = "https://raw.githubusercontent.com/clj-kondo/${pname}/v${version}/reflection.json";
sha256 = "sha256-C4QYk5lLienCHKnWXXZPcKmsCTMtIIkXOkvCrZfyIhA=";
};
src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac=";
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-XSs0u758wEuaqZvFIevBrL61YNPUJ9Sc1DS+O9agj94=";
};
dontUnpack = true;
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A linter for Clojure code that sparks joy";
homepage = "https://github.com/borkdude/clj-kondo";
homepage = "https://github.com/clj-kondo/clj-kondo";
license = licenses.epl10;
platforms = graalvm11-ce.meta.platforms;
maintainers = with maintainers; [ jlesquembre bandresen ];

View file

@ -20,7 +20,7 @@
}:
let
pname = "github-actions-runner";
version = "2.277.1";
version = "2.278.0";
deps = (import ./deps.nix { inherit fetchurl; });
nugetPackages = map
@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "183a3dd9a0d4d51feddc5fe9fa6c3b5f8b08343d"; # v${version}
sha256 = "sha256-fQH4QwdR8E76ckUjMCaKOsDjNoVBIWAw2YcFRrVucX8=";
rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version}
sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c=";
};
nativeBuildInputs = [

View file

@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.16";
version = "0.32.17";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-FrrQcZHy5WjNYCod2TBWVAj4clNWPLWLIR2/Kvkz4q0=";
sha256 = "sha256-D/8fjJIyHCRzkomRsYUnGjDMCusjNX8ZYmLjowCYgcM=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "sha256-QEHl/Hhug0Ua/SZV0iq1jc6QGGxA1NwheEgGBZRYunI=";
cargoSha256 = "sha256-Upegh3W31sTaXl0iHZ3HiYs9urgXH/XhC0vQBAWvDIc=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "vala-language-server";
version = "0.48.1";
version = "0.48.2";
src = fetchFromGitHub {
owner = "benwaffle";
repo = pname;
rev = version;
sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0";
sha256 = "sha256-vtb2l4su+zuwGbS9F+Sv0tDInQMH4Uw6GjT+s7fHIio=";
};
passthru = {

View file

@ -88,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
version = "2.2.1441";
version = "2.2.741";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm";
sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw";
};
icon = fetchurl {

View file

@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-04-21";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "ce0ac184e56d1a1865df1f0059ec01317f4210db";
sha256 = "13v1x0mxzm8fzmf8k6f3wjdx91yki6lqz40wh1897g5zvsfjfvvr";
rev = "27fefd2ccd0b4c376afdc53e7bb4c6185518d1cd";
sha256 = "0l1j2n8v2dngyxym8k0b1gf0dn2cc2gbwy36rrv447zb51g1vlv5";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -622,8 +622,8 @@ let
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
rev = "1e81624bb91e79e245832bc0a88a1c194097f641";
sha256 = "08cav97sj92vfl0y8kkn5kv5qxsfifb7xps3hndlg6vzbjci4vbr";
rev = "cb7f22500a6c3b7e3eda36db6ce9ffe5fb45d94c";
sha256 = "0lpy5h6171xjg6dinhv1m98p0qs0a3qrrhhg7vriicz3x4px73fb";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@ -1631,12 +1631,12 @@ let
git-worktree-nvim = buildVimPluginFrom2Nix {
pname = "git-worktree-nvim";
version = "2021-04-19";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "git-worktree.nvim";
rev = "77c54ff659ec3eba0965e9a54e8569abd084b726";
sha256 = "0lraa4di5z5jm103bqzr804bjcxa49b131mhpgg4r40zpam9iip1";
rev = "0ef6f419ba56154320a2547c92bf1ccb08631f9e";
sha256 = "1pr4p6akq2wivhqb116jrm72v4m1i649p624p3kb55frfxf5pynn";
};
meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/";
};
@ -1655,12 +1655,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "6b7b666cc95f91c869b1ef266e10f06807f7ccf0";
sha256 = "1ya54gkig13adcjgwjmvyssnrdz82rcwimlwk5ff6qqivwcbpsjy";
rev = "0b556d0b7ab50e19dc7db903d77ac6a8376d8a49";
sha256 = "06v2wbm582hplikjqw01r9zqgg45ji2887n288apg9yx43iknsy3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2364,12 +2364,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "e6cc09c2e95cc361babb64c113cc3e9355ea1130";
sha256 = "1jf68z7vh467fr5arbcsk5g65gjpc0dqn584hbg0cpzfmdlrbj4n";
rev = "2f17e432ee85420adcf8e0a4ebf6e638657c4253";
sha256 = "055pvfmmk8yzjajb9xx46mb5ixass3y1fsvx9p3nchsik1h3vsib";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -2760,12 +2760,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-04-20";
version = "2021-04-21";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "cb846809d81c360b3f9658ee89a9342450c99da2";
sha256 = "0r35flvb70y4ankp8v8p6jm0s9mrbg6i94n0v8avaw92xrcgl4ph";
rev = "e28c434c26f76f235087ca65ff8040ff834f9210";
sha256 = "0fdbyijlpbh845jfpp5xcc378j5m7h2yav6dwj00bvm1n79zy1wh";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -2964,12 +2964,12 @@ let
nlua-nvim = buildVimPluginFrom2Nix {
pname = "nlua-nvim";
version = "2021-01-05";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "nlua.nvim";
rev = "c0e8fbcaf8bcf5571a9e1d780a72094aad3f3094";
sha256 = "0q5aw3n4dsszk5iw7qg01xx1rbrr18jh1wqs6k9dd1kcr6yq22rq";
rev = "31e3430acb84368c0933a3e765d834e897dfca2f";
sha256 = "0h8908x2pf139q6mxckcglb5w7zxvhp0vj97za0g8343lvlhf0v1";
};
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
@ -3036,12 +3036,12 @@ let
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-04-21";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "d83b441b1838a30941af6582e9cb19d93b560b71";
sha256 = "00h40qgkrydacsj5q8yv6g7m0835dqcxf66i1s2g32wssg6c1y5f";
rev = "50a1c65caf42a0dfe3f63b3dfe1867eec5f4889d";
sha256 = "1rar4dkd0i277k71a0ydw3ipgbxjjg1hmhddwd993ihcwvk5d496";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3060,12 +3060,12 @@ let
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "4ebab39af2376b850724dd29c29579c8e024abe6";
sha256 = "0k671d27m2p0lv4vr99lra740511234f8m6zl2ykkb1b197841cg";
rev = "78ffd345d079246738ea06b04f58ad53503f48e2";
sha256 = "08xn8s9asa6b2gpbrsw1iy80s8419bck0z6nh9nmffisr3aga1bn";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3168,12 +3168,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
version = "2021-04-20";
version = "2021-04-21";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
rev = "89a00109fda04b2fe80cd4023092e5663a316777";
sha256 = "1jx9wc6v4d4y4fx97qb0nhcm8w879ckk74anzsq3l9vxg7y9ydgq";
rev = "3ad85775c081a8ab8ae8d1f2ecd1afc1bc1500d6";
sha256 = "0p55zms25kxlayjwy8i831c01fdja0k8y55iw3nx0p257fb06zbz";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@ -3192,12 +3192,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-04-16";
version = "2021-04-21";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "76c4972f6edb961e7c7486bfd0a1f629b49a3e43";
sha256 = "1c0f94hjvkj6mhx3id5867d65is1cqffj72nswgnxwx4y4psnbdg";
rev = "362a149dac40c90d917ac7bb78da988b8da6a971";
sha256 = "0psd99km6kfqwdw383w41aaq1cipcfhl1v5srjw29y2v6rgvnw9p";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -3216,12 +3216,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-04-19";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "5c005ce93367ad85933eff80887228bca2a7efee";
sha256 = "1nppy9vkl8v8biq1q9sgqxakhqlw5zm7z1wiq68zzyivlz5mj1hg";
rev = "0840c91e25557a47ed559d2281b0b65fe33b271f";
sha256 = "1k34khp227g9xffnz0sr9bm6h3hnvi3g9csxynpdzd0s2sbjsfgk";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3288,36 +3288,36 @@ let
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "7c9d8c51841c3335818d04b684e93c655b5d61c9";
sha256 = "04j34wyv7q9n7yld7k7cxxm92al3h7x3rkcnm1q61scwb1xf354r";
rev = "34cc65e594d4f4b9e0d6658a7ceb49f62820d762";
sha256 = "1gg4iyqpy68hhk4wly9k87841zns29vh04wcddn91awj5mpigb40";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "796628a7651f9399637ad8376bab920fb10493cf";
sha256 = "1mb7ncp35yhzwzwp6l54dr1y3is705sa63hlx6bf5ny84q13kvxd";
rev = "f39869514645b98ec30bc8826763c288b6cbdbef";
sha256 = "0z6arqc2i8745vc08hdbwsm1i4biywq65v1zdzrhs3ysx0agppq0";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-04-19";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "df189e28a498d90dc8813e90944e0999bc936e56";
sha256 = "0azpx89vykc1ylbn26744rdfd4f3wga0azdsg06hmz55a9q6qq8p";
rev = "e8e8c0f0f21ef5089bb305ded8ed81a16902baa7";
sha256 = "19lb10zk6mn09l4adg4xfqpsjbag52fjg9sr2ic8c6la1x8abzqk";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3600,12 +3600,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
version = "2021-04-20";
version = "2021-04-21";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "1a31d076a097ac23c0110537a99b686874ae2cdc";
sha256 = "1ah2j5bxgg0mqa8nlc76f37apb9i6vx8i1c0vlmk144w9dfmxkis";
rev = "9bd408ba679d1511e269613af840c5019de59024";
sha256 = "1xjrd445jdjy789di6d3kdgxk9ds04mq47qigmplfsnv41d5c2nj";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@ -4021,12 +4021,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
version = "2021-04-10";
version = "2021-04-21";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
rev = "a36b8f129e99becc5e00ee3267695f62c3937a2f";
sha256 = "0sk8xkqi3bciqwdd71z51mrx4dhy2i5nrf0b1c1xbzxbg3vkbvc3";
rev = "93021c0623c1822502a72131e2d45617510428b9";
sha256 = "042d7zmwmi0xhlshwwrf9bhc0j4ybksxxnrs986vm65y58c11fk3";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@ -4298,12 +4298,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-03-15";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
rev = "f2ddb480c5afa1c0f155d78e6fc7853fd20f0420";
sha256 = "05ca80alkhnxj1klyy729y81g9ng2n841djxgd7zjg8cpkk94kw3";
rev = "a739985ef9fbb9888bdeea2f442d0574a9db0565";
sha256 = "0ajpn3q36mvczmvs0g17n1lz0h69rvm25bjsalw83mjxwn46g1h4";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@ -4467,12 +4467,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-04-21";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "3adeab2bed42597c8495fbe3a2376c746232f2e3";
sha256 = "0nnqlrzgmg50kdyjmbkr29dfn8ydvdamfihrw0nalvszhh577487";
rev = "c6980a9acf8af836196508000c34dcb06b11137b";
sha256 = "0q2xqxn56gdll1pk6f9kkkfwrp1hlawqmfmj1rzp5aahm77jdx9x";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -4672,12 +4672,12 @@ let
unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim";
version = "2021-04-15";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "unicode.vim";
rev = "8b6bb82f66c1f336257e670eb9b7c03f29df3345";
sha256 = "0r082yn0jbvwxf5jfl79kzjzq5hlhqf3nkmf39g675pw2mc2fw6x";
rev = "090e77e30e46aceafd53a3219fb2a81b79927d8d";
sha256 = "136a8c4d4nrzvab2qa6sxc81x1mwg56nn8ajxikqgyvsr9fp1f9i";
};
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
@ -5248,12 +5248,12 @@ let
vim-choosewin = buildVimPluginFrom2Nix {
pname = "vim-choosewin";
version = "2021-04-06";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "t9md";
repo = "vim-choosewin";
rev = "1ca7da94aa1b8761f4212194e3c55e4a080d6525";
sha256 = "0nr6k8g0l27g4lczsy30cnh1il547qgbs4xl936v43gp4wvybah4";
rev = "839da609d9b811370216bdd9d4512ec2d0ac8644";
sha256 = "1451ji3a7waxz1kc8l2hw96fff54xwa7q8glrin8qxn48fc4605n";
};
meta.homepage = "https://github.com/t9md/vim-choosewin/";
};
@ -5524,12 +5524,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
version = "2021-04-19";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
rev = "9e3ca4e897d63ae8f64be579e42188b53d29323d";
sha256 = "1p7pps21l7d3yfsydw6axyfaaf0an7ls7j3p80vxg9ia307hqnws";
rev = "63bfd6d99ba17832f4740efa5e2e6ad6537d4552";
sha256 = "0p9n1n8n0167kgq4wwwxsnair2hqqvy6vwcqchnb15hifl3cl0w3";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@ -5932,12 +5932,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "a0e34eb5471c54f979fc613b8068efa6d5015550";
sha256 = "08xs3jzd41y0aa6g3var7shllh47g5biv4jv59f34d0l66mw18rz";
rev = "4a1938457489fe072acf2fbbe7142a3cfb0d8ad8";
sha256 = "1va57czyrihcc2cihbbil5vqhnlzvjrb9bw7wirdrpjrd04ciaa4";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -6064,12 +6064,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2021-04-13";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "9756e95bd596a303946a90f06f4efe51dcd57e87";
sha256 = "0wkcximk4alm26x9qrqbanlhhzrim95gs5cbjy0hnlrqa8xmz20k";
rev = "f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5";
sha256 = "0h00i0b8p0mnynp7hhj2vpgj9rhqmlx14y2kcskvac8i2wlyj30c";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -6160,12 +6160,12 @@ let
vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8";
version = "2021-04-06";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-gruvbox8";
rev = "acb2574d85f3878cd5ab82dc3579403c174dafc3";
sha256 = "17k3fcidsk26i9nnbk37jcgznypzwh0pzam03yayb6dw4n733mld";
rev = "217a87f4f751ed0d6fe5c79b2c0963f557bf0314";
sha256 = "1gdys8ycmmykq121ix34wva75m18nda0camiqr4aavb9hj32faj6";
};
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
};
@ -7579,12 +7579,12 @@ let
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
version = "2021-01-27";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
rev = "c980977f1d77b3285937b9d7b5baa964fc9ed7f5";
sha256 = "00f1slgrjnh8m59sm3xmias3jvjlvw26yigv9fmy6zwcynlivc5x";
rev = "31274b11e0a658b84f220ef1f5d69e171ba53ebf";
sha256 = "1687ih32rgjjxf84dw7yx2qkylrqwp4ir8hj6mlh1hmysfd13vvl";
};
meta.homepage = "https://github.com/thinca/vim-quickrun/";
};
@ -7831,12 +7831,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2021-03-07";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "2542b6459085f3d1e361e8b5bf406dec6448487e";
sha256 = "1m7m1fwn4bpbqfji7fvvgx00fxz1hy5nvfajbpj4vpgaxzqwsf8k";
rev = "6b9afcce385b1121d46f749f9cd46d05e132c1e4";
sha256 = "04yh7cq9vi1hksksyphg8s4xz64qc6pmwnrbqapfgfsmp6jk11s5";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@ -8011,12 +8011,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
version = "2021-04-02";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
rev = "5ee8914b26e9f0b2d8ec01b3cef8c46e7a3954b5";
sha256 = "0zg100sjbn7952ayqligpkfqvrh1qwr2q6pjqs5cnsyl5xs411v2";
rev = "3ffa62fbe781b3df20fafa3bd9d710dc99c16a8c";
sha256 = "0ysr07yy9fxgz8drn11hgcwns7d0minh4afrjxrz9lwcm7c994h4";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
@ -8033,6 +8033,18 @@ let
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
vim-strip-trailing-whitespace = buildVimPluginFrom2Nix {
pname = "vim-strip-trailing-whitespace";
version = "2021-01-03";
src = fetchFromGitHub {
owner = "axelf4";
repo = "vim-strip-trailing-whitespace";
rev = "9a93dd653806ba3f886b2cf92111b663ce8d44bd";
sha256 = "1pvirqj21xl2qbs9ycdp7n3lnf4n8b2bz1y90nphnvda4dfaac8l";
};
meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/";
};
vim-stylish-haskell = buildVimPluginFrom2Nix {
pname = "vim-stylish-haskell";
version = "2019-11-28";
@ -8540,12 +8552,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
version = "2021-04-16";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
rev = "4c605b1ef91194ff178fdb1d957ab5b655a7089a";
sha256 = "1zngyw1bj9bws00qyfcz3vc6fpybqrmxa43hy2pvga5anfjm5y6a";
rev = "20163f6ffda855fa40a11cb999002211dc66288f";
sha256 = "1g29z5f2w1g6znljdgwn49wp8g85m1pawvg8qjrh1kxyjv9dr8x1";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@ -8756,12 +8768,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-04-20";
version = "2021-04-22";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "297c0bea56fd3afce5209f47f330880d759c8698";
sha256 = "04gkw01p5iiyj1xp9p446frg7f9szprm65gjs3w0s0akgbi5zp3g";
rev = "a47d0b921c42be740e57d75a73ae15a8ee0141d4";
sha256 = "05nhav31i3d16d1qdcgbkr8dfgwi53123sv3xd9pr8j7j3rdd0ix";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -8899,6 +8911,18 @@ let
meta.homepage = "https://github.com/lukaszkorecki/workflowish/";
};
wstrip-vim = buildVimPluginFrom2Nix {
pname = "wstrip-vim";
version = "2021-03-14";
src = fetchFromGitHub {
owner = "tweekmonster";
repo = "wstrip.vim";
rev = "3d4c35c8ca462fbece58886e52679a5355f461d6";
sha256 = "020bikc5482gzshjh2vgvknqxpzzzaff14z1rj6b2yvmbr2a837f";
};
meta.homepage = "https://github.com/tweekmonster/wstrip.vim/";
};
xptemplate = buildVimPluginFrom2Nix {
pname = "xptemplate";
version = "2020-06-29";

View file

@ -25,6 +25,7 @@ ap/vim-css-color
arcticicestudio/nord-vim
artur-shaik/vim-javacomplete2
autozimu/LanguageClient-neovim
axelf4/vim-strip-trailing-whitespace
ayu-theme/ayu-vim
bakpakin/fennel.vim
bazelbuild/vim-bazel
@ -656,6 +657,7 @@ tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
tversteeg/registers.nvim@main
tweekmonster/wstrip.vim
twerth/ir_black
twinside/vim-haskellconceal
Twinside/vim-hoogle

View file

@ -1,4 +1,4 @@
{ lib, stdenv, kernel, udev, autoconf, automake, libtool, kernelOlder }:
{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }:
stdenv.mkDerivation {
name = "usbip-${kernel.name}";
@ -22,6 +22,8 @@ stdenv.mkDerivation {
./autogen.sh
'';
configureFlags = [ "--with-usbids-dir=${hwdata}/share/hwdata/" ];
meta = with lib; {
homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip";
description = "allows to pass USB device from server to client over the network";

View file

@ -583,7 +583,7 @@
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
"omnilogic" = ps: with ps; [ omnilogic ];
"onboarding" = ps: with ps; [ aiohttp-cors pillow ];
"ondilo_ico" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ondilo
"ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ];
"onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
"onkyo" = ps: with ps; [ onkyo-eiscp ];
"onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async

View file

@ -331,6 +331,7 @@ in with py.pkgs; buildPythonApplication rec {
"notion"
"number"
"omnilogic"
"ondilo_ico"
"ozw"
"panel_custom"
"panel_iframe"

View file

@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.7.1";
version = "10.7.2";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
sha256 = "sha256-pgFksZz0sD73uZDyUIhdFCgHPo67ZZiwklafyemJFGs=";
sha256 = "sha256-l2tQmKez06cekq/QLper+OrcSU/0lWpZ85xY2wZcK1s=";
};
nativeBuildInputs = [

View file

@ -1,21 +1,25 @@
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev
, pkg-config, qtbase, cmake, zlib, kmod }:
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:
mkDerivation rec {
version = "0.4.2";
version = "0.4.4";
pname = "ckb-next";
src = fetchFromGitHub {
owner = "ckb-next";
repo = "ckb-next";
rev = "v${version}";
sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc";
sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7";
};
buildInputs = [
udev
qtbase
zlib
libXdmcp
qttools
qtx11extras
libdbusmenu
];
nativeBuildInputs = [

View file

@ -1,12 +1,12 @@
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 2fc10a8..22dbd14 100644
index a04b80c..2969b3b 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
@@ -437,7 +437,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service"
- DESTINATION "/usr/lib/systemd/system"
- DESTINATION "${SYSTEMD_UNIT_INSTALL_DIR}"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
PERMISSIONS
OWNER_READ OWNER_WRITE

View file

@ -1,21 +1,21 @@
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
index 8489f5b..b851419 100644
index 933e628..c4f97f2 100644
--- a/src/daemon/input_linux.c
+++ b/src/daemon/input_linux.c
@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){
@@ -70,7 +70,7 @@ int os_inputopen(usbdevice* kb){
// If not available, load the module
if(fd < 0){
- if(system("modprobe uinput") != 0) {
+ if(system("@kmod@/bin/modprobe uinput") != 0) {
ckb_fatal("Failed to load uinput module\n");
ckb_fatal("Failed to load uinput module");
return 1;
}
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 1eb95bd..f7d38ba 100644
index eeadaf8..87de71f 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){
@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){
#elif defined(Q_OS_LINUX)
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
QProcess modprobe;

View file

@ -0,0 +1,47 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "cyclonedx-python";
version = "0.4.3";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python";
rev = "v${version}";
sha256 = "BvG4aWBMsllW2L4lLsiRFUCPjgoDpHxN49fsUFdg7tQ=";
};
# They pin versions for exact version numbers because "A bill-of-material such
# as CycloneDX expects exact version numbers" -- but that's unnecessary with
# Nix.
preBuild = ''
sed "s@==.*'@'@" -i setup.py
'';
propagatedBuildInputs = with python3.pkgs; [
packageurl-python
requests
xmlschema
setuptools
requirements-parser
packaging
chardet
jsonschema
];
# the tests want access to the cyclonedx binary
doCheck = false;
pythonImportsCheck = [
"cyclonedx"
];
meta = with lib; {
description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects";
homepage = "https://github.com/CycloneDX/cyclonedx-python";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests
, lvm2, pam, python, util-linux, json_c, nixosTests
, ncurses }:
stdenv.mkDerivation rec {
pname = "snapper";
version = "0.8.15";
version = "0.9.0";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
sha256 = "1rqv1qfxr02qbkix1mpx91s4827irxryxkhby3ii0fdkm3ympsas";
sha256 = "1gx3ichbkdqlzl7w187vc3xpmr9prmnp7as0h6ympgigradj5c7g";
};
nativeBuildInputs = [
@ -26,14 +26,6 @@ stdenv.mkDerivation rec {
passthru.tests.snapper = nixosTests.snapper;
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/openSUSE/snapper/commit/c51708aea22d9436da287cba84424557ad03644b.patch";
sha256 = "106pf7pv8z3q37c8ckmgwxs1phf2fy7l53a9g5xq5kk2rjj1cx34";
})
];
postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere...
for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do

View file

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "earlybird";
version = "1.25.0";
src = fetchFromGitHub {
owner = "americanexpress";
repo = "earlybird";
# According to the GitHub repo, the latest version *is* 1.25.0, but they
# tagged it as "refs/heads/main-2"
rev = "4f365f1c02972dc0a68a196a262912d9c4325b21";
sha256 = "UZXHYBwBmb9J1HrE/htPZcKvZ+7mc+oXnUtzgBmBgN4=";
};
vendorSha256 = "oSHBR1EvK/1+cXqGNCE9tWn6Kd/BwNY3m5XrKCAijhA=";
meta = with lib; {
description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
homepage = "https://github.com/americanexpress/earlybird";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "ntlmrecon";
version = "0.4";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pwnfoo";
repo = "NTLMRecon";
rev = "v-${version}";
sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6";
};
propagatedBuildInputs = with python3.pkgs; [
colorama
iptools
requests
termcolor
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "ntlmrecon" ];
meta = with lib; {
description = "Information enumerator for NTLM authentication enabled web endpoints";
homepage = "https://github.com/pwnfoo/NTLMRecon";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,38 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "xorex";
version = "0.3.0";
format = "other";
src = fetchFromGitHub {
owner = "Neo23x0";
repo = "xorex";
rev = version;
sha256 = "rBsOSXWnHRhpLmq20XBuGx8gGBM8ouMyOISkbzUcvE4=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
chmod +x xorex.py
mv xorex.py $out/bin/xorex
runHook postInstall
'';
propagatedBuildInputs = with python3.pkgs; [
colorama
pefile
];
meta = with lib; {
description = "XOR Key Extractor";
homepage = "https://github.com/Neo23x0/xorex";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -0,0 +1,39 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "yarGen";
version = "0.23.4";
format = "other";
src = fetchFromGitHub {
owner = "Neo23x0";
repo = "yarGen";
rev = version;
sha256 = "6PJNAeeLAyUlZcIi0g57sO1Ex6atn7JhbK9kDbNrZ6A=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
chmod +x yarGen.py
mv yarGen.py $out/bin/yargen
runHook postInstall
'';
propagatedBuildInputs = with python3.pkgs; [
scandir
pefile
lxml
];
meta = with lib; {
description = "A generator for YARA rules";
homepage = "https://github.com/Neo23x0/yarGen";
license = licenses.bsd3;
maintainers = teams.determinatesystems.members;
};
}

View file

@ -1300,6 +1300,8 @@ in
cyclone-scheme = callPackage ../development/interpreters/cyclone { };
cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
deltachat-electron = callPackage
../applications/networking/instant-messengers/deltachat-electron { };
@ -1710,6 +1712,10 @@ in
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
bc = callPackage ../tools/misc/bc { };
bdf2psf = callPackage ../tools/misc/bdf2psf { };
@ -2370,6 +2376,8 @@ in
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
earlybird = callPackage ../tools/security/earlybird { };
earlyoom = callPackage ../os-specific/linux/earlyoom { };
EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };
@ -6934,6 +6942,8 @@ in
notable = callPackage ../applications/misc/notable { };
ntlmrecon = callPackage ../tools/security/ntlmrecon { };
nvchecker = with python3Packages; toPythonApplication nvchecker;
miller = callPackage ../tools/text/miller { };
@ -16354,6 +16364,8 @@ in
libxls = callPackage ../development/libraries/libxls { };
libxlsxwriter = callPackage ../development/libraries/libxlsxwriter { };
libxmi = callPackage ../development/libraries/libxmi { };
libxml2 = callPackage ../development/libraries/libxml2 {
@ -30687,6 +30699,8 @@ in
xortool = python3Packages.callPackage ../tools/security/xortool { };
xorex = callPackage ../tools/security/xorex { };
xow = callPackage ../misc/drivers/xow { };
xbps = callPackage ../tools/package-management/xbps { };
@ -30755,6 +30769,8 @@ in
yara = callPackage ../tools/security/yara { };
yarGen = callPackage ../tools/security/yarGen { };
yaxg = callPackage ../tools/graphics/yaxg {};
yuzu-mainline = import ../misc/emulators/yuzu {

View file

@ -1707,6 +1707,8 @@ in {
debugpy = callPackage ../development/python-modules/debugpy { };
debut = callPackage ../development/python-modules/debut { };
decorator = callPackage ../development/python-modules/decorator { };
deep_merge = callPackage ../development/python-modules/deep_merge { };
@ -4530,6 +4532,8 @@ in {
omnilogic = callPackage ../development/python-modules/omnilogic { };
ondilo = callPackage ../development/python-modules/ondilo { };
onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
onnx = callPackage ../development/python-modules/onnx { };
@ -5529,6 +5533,10 @@ in {
PyICU = callPackage ../development/python-modules/pyicu { };
pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy {
inherit (pkgs) ssdeep;
};
pyinotify = callPackage ../development/python-modules/pyinotify { };
pyinputevent = callPackage ../development/python-modules/pyinputevent { };
@ -5651,6 +5659,8 @@ in {
pymc3 = callPackage ../development/python-modules/pymc3 { };
pymdstat = callPackage ../development/python-modules/pymdstat { };
pymediainfo = callPackage ../development/python-modules/pymediainfo { };
pymediaroom = callPackage ../development/python-modules/pymediaroom { };
@ -6006,6 +6016,8 @@ in {
pysmb = callPackage ../development/python-modules/pysmb { };
pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { };
pysmbc = callPackage ../development/python-modules/pysmbc { };
pysmf = callPackage ../development/python-modules/pysmf { };
@ -6487,6 +6499,8 @@ in {
python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
python-registry = callPackage ../development/python-modules/python-registry { };
python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };
python-sat = callPackage ../development/python-modules/python-sat { };
@ -6715,6 +6729,8 @@ in {
qds_sdk = callPackage ../development/python-modules/qds_sdk { };
qiling = callPackage ../development/python-modules/qiling { };
qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { };
qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
@ -6900,6 +6916,8 @@ in {
requirements-detector = callPackage ../development/python-modules/requirements-detector { };
requirements-parser = callPackage ../development/python-modules/requirements-parser { };
resampy = callPackage ../development/python-modules/resampy { };
responses = callPackage ../development/python-modules/responses { };
@ -7447,6 +7465,8 @@ in {
spark_parser = callPackage ../development/python-modules/spark_parser { };
sparklines = callPackage ../development/python-modules/sparklines { };
SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { };
sparse = callPackage ../development/python-modules/sparse { };
@ -7814,6 +7834,8 @@ in {
termstyle = callPackage ../development/python-modules/termstyle { };
tern = callPackage ../development/python-modules/tern { };
teslajsonpy = callPackage ../development/python-modules/teslajsonpy { };
tess = callPackage ../development/python-modules/tess { };