mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 06:08:16 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
94e4b96dfc
@ -12077,6 +12077,12 @@
|
||||
fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF";
|
||||
}];
|
||||
};
|
||||
wentasah = {
|
||||
name = "Michal Sojka";
|
||||
email = "wsh@2x.cz";
|
||||
github = "wentasah";
|
||||
githubId = 140542;
|
||||
};
|
||||
wheelsandmetal = {
|
||||
email = "jakob@schmutz.co.uk";
|
||||
github = "wheelsandmetal";
|
||||
|
||||
@ -947,6 +947,15 @@
|
||||
"sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"sentry": {
|
||||
"owner": "jianyuan",
|
||||
"provider-source-address": "registry.terraform.io/jianyuan/sentry",
|
||||
"repo": "terraform-provider-sentry",
|
||||
"rev": "v0.6.0",
|
||||
"sha256": "0246hv52kslrzj43dkbk8r8gimwz3sgzxsbv7sxwmk3ll3sl2zrk",
|
||||
"vendorSha256": "1d4c8cg4a81mndrzwrsi1k9ll553csnb0r4avlq9hyc03z60dwdc",
|
||||
"version": "0.6.0"
|
||||
},
|
||||
"shell": {
|
||||
"owner": "scottwinkler",
|
||||
"provider-source-address": "registry.terraform.io/scottwinkler/shell",
|
||||
|
||||
29
pkgs/applications/networking/p2p/rqbit/default.nix
Normal file
29
pkgs/applications/networking/p2p/rqbit/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dyf1sjfiwrrigk1186mzvx5vn196h45imvily394ky2di633av5";
|
||||
};
|
||||
|
||||
cargoSha256 = "02z5gdmir1x80axnv516hs00478c7zbb30rdsbs966yh1725w12z";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A bittorrent client in Rust";
|
||||
homepage = "https://github.com/ikatson/rqbit";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-branchless";
|
||||
version = "0.3.6-nixos.0";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arxanas";
|
||||
repo = "git-branchless";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sq+43w7xgrCe2w+9A/gfe/34+K2IgZVholtD+WF59Qo=";
|
||||
sha256 = "sha256-knRRjTjnhpedcQTVpJnBsrnaeRbjZ2i3aABeE0LrQ+c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tCpvIqGMklOUJ/+d8poq4uz2EyZTkBmtlkA/BUIVPxs=";
|
||||
cargoSha256 = "sha256-NyzsY5d4iC3zMSzmh9Qmd211oT6lmhUdvIfQdnzrtok=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -81,5 +81,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "gnome-disks";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,19 +5,20 @@
|
||||
, aws-c-compression
|
||||
, aws-c-http
|
||||
, aws-c-io
|
||||
, aws-c-sdkutils
|
||||
, cmake
|
||||
, s2n-tls
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp";
|
||||
sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,6 +34,10 @@ stdenv.mkDerivation rec {
|
||||
s2n-tls
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aws-c-sdkutils
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
|
||||
40
pkgs/development/libraries/aws-c-sdkutils/default.nix
Normal file
40
pkgs/development/libraries/aws-c-sdkutils/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, aws-c-common
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-sdkutils";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-sdkutils";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jYeyNEoJsF67XQAkmC7oegnIRBRD3FXKf5wF/NCVb4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
aws-c-common
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "AWS SDK utility library";
|
||||
homepage = "https://github.com/awslabs/aws-c-sdkutils";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
};
|
||||
}
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "extractcode";
|
||||
version = "21.7.23";
|
||||
version = "30.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757";
|
||||
sha256 = "5a660d1b9e3bae4aa87828e6947dc3b31dc2fa6705acb28a514874602b40bc90";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hole";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "065fxc0l16j8xkjd0y0qar9cmqmjyp8jcshakbakldkfscpx3s5m";
|
||||
sha256 = "sha256-T6U6WVx+5+/UaSS2mMmjAjWu67ut+YGpq2ooP9YEazI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,19 +9,18 @@
|
||||
, pygments
|
||||
, pyquery
|
||||
, requests
|
||||
, six
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "howdoi";
|
||||
version = "2.0.17";
|
||||
version = "2.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleitz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1cc9hbnalbsd5la9wsm8s6drb79vlzin9qnv86ic81r5nq27n180";
|
||||
sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -33,7 +32,6 @@ buildPythonPackage rec {
|
||||
pygments
|
||||
pyquery
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -50,7 +48,9 @@ buildPythonPackage rec {
|
||||
"test_get_text_without_links"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "howdoi" ];
|
||||
pythonImportsCheck = [
|
||||
"howdoi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Instant coding answers via the command line";
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ismartgate";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s9fHvjqPHDKuT/DMGu1ETuPNlFIkp0wlv15KeTb6fX8=";
|
||||
sha256 = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,7 +6,6 @@ buildPythonPackage rec {
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
# No tests in PyPi Tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfminer";
|
||||
repo = "pdfminer.six";
|
||||
@ -16,6 +15,12 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ chardet cryptography sortedcontainers ];
|
||||
|
||||
postInstall = ''
|
||||
for file in $out/bin/*.py; do
|
||||
ln $file ''${file//.py/}
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ nose ];
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpx
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
@ -16,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -25,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "05zn923zsr3jdilhj7bl16sabxy3ziwwlz30jq1xappbf824f9sa";
|
||||
sha256 = "sha256-49dQgzYsEn5jmHWTJ3e3QOTqNeoTRMjUWxp+MaOYod4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,7 +45,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "teslajsonpy" ];
|
||||
pythonImportsCheck = [
|
||||
"teslajsonpy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to work with Tesla API";
|
||||
|
||||
@ -461,12 +461,12 @@ final: prev:
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-10-22";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "094a446fdcceb72a28a47314a92ab2537dd747ec";
|
||||
sha256 = "0q9qjxc49w80v5d2apzzcl2bhdr050f4bib6w27msva4r9vzsgjy";
|
||||
rev = "db05991d79230f8f4a54a186f619bf909731c1b8";
|
||||
sha256 = "053p0qfghwj06vg2n5fi30491x8qrl2aih95gw3zk2r6lg384rqg";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@ -749,12 +749,12 @@ final: prev:
|
||||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2021-10-14";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "f9188b2652d7bf7131c74532e52ba25340d63b9f";
|
||||
sha256 = "093chsnh5fx4qwdw5dnn7h48fn2zlq0skwanlwm6ajws397n194k";
|
||||
rev = "9fc34a66e6744f52769bb0b95cba851723964faf";
|
||||
sha256 = "0lhvaygicayqpabgmdya6fq7yybch5nd7myjydmcdnpmivzh7mk8";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
@ -874,8 +874,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "4208e09ea8d8b75b6273468cf4cfb48e4a3f59ca";
|
||||
sha256 = "1182y3lafs37dx1alpr58phvnfncknx3ia4j401hckp49i3sdxql";
|
||||
rev = "4d6cfc83622bc220891b9abba7ca82e6919fd844";
|
||||
sha256 = "1akn9sf753nj2ch2kl3j1w2bxvva3maxsg5wj52mx3mgr81bwshl";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
@ -1616,12 +1616,12 @@ final: prev:
|
||||
|
||||
dracula-vim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula-vim";
|
||||
version = "2021-09-22";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "86eb25b3dc8aa228373723c92f102f9d5fffdf11";
|
||||
sha256 = "178wmg12bl30nq3plxa43j7597lzq7dm9hi7zi07p2xxg4ipnzh6";
|
||||
rev = "e5f09746562ef0226d3484a01609ceca41700a3d";
|
||||
sha256 = "1k5bwif20srhzwj8fwigrih1npjnjcvivl7sr7idspp7rig7lldk";
|
||||
};
|
||||
meta.homepage = "https://github.com/dracula/vim/";
|
||||
};
|
||||
@ -2175,8 +2175,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "a2a18c69bfd7923c4be8a57ed91d5dd0e7e34a93";
|
||||
sha256 = "064fkd3dx16cxkkcghwc332v22xdghbfh7dakq81c269w5qzk8gr";
|
||||
rev = "d12442a924dc431467149f1fcb33e1c648116803";
|
||||
sha256 = "0gpnp3vp0418hhjlwdawxc7slyh6p8pmdvycjm6rmyr0xjxx7ipm";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
@ -2423,12 +2423,12 @@ final: prev:
|
||||
|
||||
hop-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hop.nvim";
|
||||
version = "2021-10-12";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaazon";
|
||||
repo = "hop.nvim";
|
||||
rev = "2097f623b6b04f9d03e1d23c08e975e5079be64f";
|
||||
sha256 = "0d1brmiqsnq0crm5844m2sj2df7vj0ad1bkdrmyxvgnphq0z443p";
|
||||
rev = "4a7cadead26bc3094318415cdeb693840f518383";
|
||||
sha256 = "00vf4g9is4080mkdycpz2ra4lp9nm635987wg20zp21v1mrh2xzz";
|
||||
};
|
||||
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
||||
};
|
||||
@ -2964,12 +2964,12 @@ final: prev:
|
||||
|
||||
lightspeed-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lightspeed.nvim";
|
||||
version = "2021-10-21";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "lightspeed.nvim";
|
||||
rev = "61710967a57cc780f4b505c3821d3be54f53e79b";
|
||||
sha256 = "12g6dfc5pkxz0s2vq6p747zw21pigv6sskrgnxsq7awp92xahxbd";
|
||||
rev = "b2e9a06a84623c3e9dcd81a9ecb3155662f392f6";
|
||||
sha256 = "0x0axm9qbadc4d264synxlfv5gr8zmf2xzs2vcich1zrxavq8bgr";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
|
||||
};
|
||||
@ -3060,12 +3060,12 @@ final: prev:
|
||||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2021-10-21";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "c88cc24ec89a7ab0ecabdd6624f0bf717d83d2dd";
|
||||
sha256 = "0jgznv9x7ickpdy492prv6yird847hqxjvr0a5zzfxbhlyvdysqk";
|
||||
rev = "fddd3f958af06c0239a9b019cb2e180a93cb6a9c";
|
||||
sha256 = "19fd5fc3336jlhari9yzm24wkgk7c4ycqzd3s706m9w7d05m004d";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
@ -3096,24 +3096,24 @@ final: prev:
|
||||
|
||||
lualine-lsp-progress = buildVimPluginFrom2Nix {
|
||||
pname = "lualine-lsp-progress";
|
||||
version = "2021-10-02";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "arkav";
|
||||
repo = "lualine-lsp-progress";
|
||||
rev = "c9537d085a8fce6f8473d30965b6a0e2536b2c80";
|
||||
sha256 = "1xy7g4d7k4is81mxdsjgagqkbzygpb4dmpbypapwxp6vv44wfl36";
|
||||
rev = "56842d097245a08d77912edf5f2a69ba29f275d7";
|
||||
sha256 = "1gz5nxpfky0xr53l0z67viknzbxdr3k7pp5bp1n3rka3s74jswzh";
|
||||
};
|
||||
meta.homepage = "https://github.com/arkav/lualine-lsp-progress/";
|
||||
};
|
||||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine.nvim";
|
||||
version = "2021-10-22";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "71f6fed3c3b29366bf58b2753803b93f58646ca4";
|
||||
sha256 = "0wn9hjln2ixgm42sgy1biswp3knhac818bnj2v24ji7swryxjjda";
|
||||
rev = "ef063f72b48caf9c31dec670ddc489f05bad0949";
|
||||
sha256 = "003r00b38z5njmraj9rhrw1ci6ifl6rb9sa2592csa6y5cx5wayy";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
||||
};
|
||||
@ -3540,12 +3540,12 @@ final: prev:
|
||||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2021-10-20";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "63c50a72ec44033b95a7dbc3bc2515bfa4dea457";
|
||||
sha256 = "1rvn9bnjxhbmkd96b6a525yb4r8v338rc5k0vq6c6lxqd413vzrs";
|
||||
rev = "27cc8b028993c285e4c2d02cd0384940caabf753";
|
||||
sha256 = "05lpaipn6bnxxx6i5rap6m137kjlknqdbz9cikfx5p2fq61w6li0";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
@ -3804,12 +3804,12 @@ final: prev:
|
||||
|
||||
nightfox-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nightfox.nvim";
|
||||
version = "2021-10-21";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdenEast";
|
||||
repo = "nightfox.nvim";
|
||||
rev = "fb46cbf616470707fac1232d135c0bd69906249d";
|
||||
sha256 = "0lia11ni3q3ixjhngnhyrz4s33f19p784y22x3vxi0nvnibj6c40";
|
||||
rev = "21935c25fe681d43e381d49b0a44c9298d204841";
|
||||
sha256 = "0d1ims59a90avd45338m02219pmplnadssksa24r03h3kh4x5pdi";
|
||||
};
|
||||
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
|
||||
};
|
||||
@ -3840,12 +3840,12 @@ final: prev:
|
||||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn.vim";
|
||||
version = "2021-10-22";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "be8fb31a073f92bf30d066bee7e4cb3a156ae101";
|
||||
sha256 = "18j5m27wlwanzp63yh3db8hn1qkpbzr21jix3qjjkkj1bjw2cjh3";
|
||||
rev = "de9dced7f0b10dde5938f53643baa3586b7941d8";
|
||||
sha256 = "0sdqgivlsjl5558dyakrh7vzpcnwkma5paz4i8zis1cj3zc0s78p";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
@ -4012,8 +4012,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "533f17c5692d2b81cda487b327fafcbf8967142c";
|
||||
sha256 = "1cc9a9wv00wqfd1cb9nk13hy51fjh128yhmd4zkkw9qgd7qhcks9";
|
||||
rev = "b185e303bd00390325c582d0366f85298cf84299";
|
||||
sha256 = "12ssag1nlg01vy1x8ip8mfclcklmvkysf3mvg6223scawy2kggk7";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
@ -4260,12 +4260,12 @@ final: prev:
|
||||
|
||||
nvim-notify = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-notify";
|
||||
version = "2021-10-12";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-notify";
|
||||
rev = "4743b32755ff3cb2e03fd4a0a6413bb7ea9e2617";
|
||||
sha256 = "06v0swwlk22n0x26bgw1krf26vr7khkc2yjdi4y13saj47c46z4p";
|
||||
rev = "8b2ef65a6e9f7060cba82bcd7eab1d626f5bfb3f";
|
||||
sha256 = "0yhj3p3zsyxxwjj2p0h7aymgn1wsaa8999r8s58w76pvh6syg0ca";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
|
||||
};
|
||||
@ -4296,12 +4296,12 @@ final: prev:
|
||||
|
||||
nvim-solarized-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-solarized-lua";
|
||||
version = "2021-07-09";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ishan9299";
|
||||
repo = "nvim-solarized-lua";
|
||||
rev = "fa437ae65a6c1239525e4ec7f4cbf4671eaa55ba";
|
||||
sha256 = "032gs63g3x62mym6nhznvywsqk1cxsgwx0fv2vyh2c929fb27ji7";
|
||||
rev = "39ed6d841a71de0fcc51d6665638e864e42116cb";
|
||||
sha256 = "11v8vxz3daj2sl13hgvd8cadh7h5kij5kg43km917an5k1cw293j";
|
||||
};
|
||||
meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/";
|
||||
};
|
||||
@ -4332,12 +4332,12 @@ final: prev:
|
||||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2021-10-16";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "ec3f10e2116f344d9cc5c9980bddf7819f27d8ae";
|
||||
sha256 = "0vwlxghxyc82w2vmn6nylnvhcvr91k9z0szjwn67f8n1bnii2fn7";
|
||||
rev = "6cadd3a9d7202524648d5fcbf5e6da9ddd32cd19";
|
||||
sha256 = "0nnyqq969lnzakhj1wnf9llz0www358b4cj2ch6vjaih3zvw9zva";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||
};
|
||||
@ -4536,12 +4536,12 @@ final: prev:
|
||||
|
||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2021-10-21";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "abf91455610bc11b9a2f9e504179b9e48042e6b6";
|
||||
sha256 = "0a5dp4fa4c63n1mpwn0jnhid0hzxiw33vqwrxdsiawgxdgg71sad";
|
||||
rev = "fb655cbeb5f6e3ddf2e810e50fa0f32206f08b13";
|
||||
sha256 = "15fniwdvd5pas27zbivxkph6qcdiar6rw4njn7jblfm07c08wvxc";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
@ -5825,12 +5825,12 @@ final: prev:
|
||||
|
||||
telescope-project-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-project.nvim";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-project.nvim";
|
||||
rev = "348f5c77fc1581063c5c30eed5fd79561ca203fe";
|
||||
sha256 = "0ply7ffv5r6p0n7agix329h226c0rlyvqvw2l9jxfn0z2wmc2y3x";
|
||||
rev = "50ae840e22659c68468bec1c9d3df4467255a512";
|
||||
sha256 = "0y014s942f0r0g5w01ib90fappz9wsjq509is8qrvq9zw7dlhk1z";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
|
||||
};
|
||||
@ -6070,8 +6070,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "trouble.nvim";
|
||||
rev = "d40695ee07736d16bd764afb48faa193a33641ac";
|
||||
sha256 = "0fqdrp4xyfzb6ch0p1dqlk5sa8xf6rf25kbfn63acjp5c23g6rl1";
|
||||
rev = "756f09de113a775ab16ba6d26c090616b40a999d";
|
||||
sha256 = "016aivnqq9lh33in5611phhl7h6sz9xqgmiaq5swk4pk7vyl4nqq";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/trouble.nvim/";
|
||||
};
|
||||
@ -7230,12 +7230,12 @@ final: prev:
|
||||
|
||||
vim-dispatch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-dispatch";
|
||||
version = "2021-10-07";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-dispatch";
|
||||
rev = "11420880486936bcbadd271e818e22337a874501";
|
||||
sha256 = "1b2g77fyiw3b1qipscnc99by4xwmap0vw0wyshqy1jf3pla8shjh";
|
||||
rev = "a99a671aff87f77da9ac3461e589393b5ecfcd88";
|
||||
sha256 = "0jsl7as2xc9mq2za58r9bxxghicmp7g86hzmpy8w7h8a3m9wpgz5";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-dispatch/";
|
||||
};
|
||||
@ -7770,12 +7770,12 @@ final: prev:
|
||||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2021-10-19";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "d317e93675df73feaa2aa32f4cb8f77feeb7114a";
|
||||
sha256 = "0a2xv161kxqjgqvp72ha0gndqvv8f4rrzgiph1lpqbrfhp9jiqci";
|
||||
rev = "2831f4872431685d28fbe3e567cd539a455fe750";
|
||||
sha256 = "1cirvsx7z6qnqp8nq6iidy881kzkz6bfck1zkdrwss8skhjpw1hc";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
@ -9403,6 +9403,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/tpope/vim-rails/";
|
||||
};
|
||||
|
||||
vim-reasonml = buildVimPluginFrom2Nix {
|
||||
pname = "vim-reasonml";
|
||||
version = "2020-07-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jordwalke";
|
||||
repo = "vim-reasonml";
|
||||
rev = "50dafc42085b704acaa03576cd2ffcaacea58e14";
|
||||
sha256 = "1yfll4rbanql0l27bazk4xk205mk73nk1l9cxyvc9p8qcixx34s4";
|
||||
};
|
||||
meta.homepage = "https://github.com/jordwalke/vim-reasonml/";
|
||||
};
|
||||
|
||||
vim-repeat = buildVimPluginFrom2Nix {
|
||||
pname = "vim-repeat";
|
||||
version = "2021-01-25";
|
||||
@ -10174,12 +10186,12 @@ final: prev:
|
||||
|
||||
vim-tpipeline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-tpipeline";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimpostor";
|
||||
repo = "vim-tpipeline";
|
||||
rev = "38eb11b71e279936d18d75afcbf2095a54cf10b0";
|
||||
sha256 = "0fdpnnq3xghdzjlyw5rwk3i7iqpybscqvyk442qmq7rak6gb1z09";
|
||||
rev = "03bc6aa0a81f5239a22b7c1e61280a898f39ab7c";
|
||||
sha256 = "13hfwv3yb1qp4ryqg62yv79zz2pv3sb0ccricbld7kb4a8qi9q7x";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
||||
};
|
||||
|
||||
@ -285,6 +285,7 @@ jonbri/vim-colorstepper
|
||||
jonsmithers/vim-html-template-literals
|
||||
joonty/vim-xdebug
|
||||
joosepalviste/nvim-ts-context-commentstring@main
|
||||
jordwalke/vim-reasonml
|
||||
josa42/coc-lua
|
||||
josa42/vim-lightline-coc
|
||||
jose-elias-alvarez/minsnip.nvim@main
|
||||
|
||||
37
pkgs/os-specific/linux/libtraceevent/default.nix
Normal file
37
pkgs/os-specific/linux/libtraceevent/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtraceevent";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
|
||||
rev = "libtraceevent-${version}";
|
||||
sha256 = "1x36qsrcssjywjpwkgyp9hz6y878kivma9pz7zrhxdsrqv2d2zs1";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
postPatch = ''
|
||||
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "devman" ];
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
"doc" # build docs
|
||||
];
|
||||
installFlags = [
|
||||
"pkgconfig_dir=${placeholder "out"}/lib/pkgconfig"
|
||||
"doc-install"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux kernel trace event library";
|
||||
homepage = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ wentasah ];
|
||||
};
|
||||
}
|
||||
38
pkgs/os-specific/linux/libtracefs/default.nix
Normal file
38
pkgs/os-specific/linux/libtracefs/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtracefs";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
|
||||
rev = "libtracefs-${version}";
|
||||
sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb";
|
||||
};
|
||||
|
||||
# Don't build and install html documentation
|
||||
postPatch = ''
|
||||
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "devman" ];
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
|
||||
buildInputs = [ libtraceevent ];
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
"doc" # build docs
|
||||
];
|
||||
installFlags = [
|
||||
"pkgconfig_dir=${placeholder "out"}/lib/pkgconfig"
|
||||
"install_doc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux kernel trace file system library";
|
||||
homepage = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ wentasah ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,23 @@
|
||||
{ lib, stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
|
||||
{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trace-cmd";
|
||||
version = "2.9.1";
|
||||
version = "2.9.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
|
||||
rev = "trace-cmd-v${version}";
|
||||
sha256 = "19c63a0qmcppm1456qf4k6a0d1agcvpa6jnbzrdcyc520yax6khw";
|
||||
sha256 = "0kc5cldk5i7q2zr2nyz3mvs5v7w0km6lpx7g39sy3pmhshp0wqlq";
|
||||
};
|
||||
|
||||
patches = [ ./fix-Makefiles.patch ];
|
||||
# Don't build and install html documentation
|
||||
postPatch = ''
|
||||
sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \
|
||||
Documentation{,/trace-cmd,/libtracecmd}/Makefile
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ asciidoc libxslt ];
|
||||
nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto ];
|
||||
|
||||
buildInputs = [ libtraceevent libtracefs ];
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
@ -19,20 +25,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = "make trace-cmd libs doc";
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [
|
||||
"all" "libs" "doc"
|
||||
# The following values appear in the generated .pc file
|
||||
"prefix=${placeholder "lib"}"
|
||||
"libdir=${placeholder "lib"}/lib"
|
||||
"includedir=${placeholder "dev"}/include"
|
||||
];
|
||||
|
||||
installTargets = [ "install_cmd" "install_libs" "install_doc" ];
|
||||
installFlags = [
|
||||
"bindir=${placeholder "out"}/bin"
|
||||
"man_dir=${placeholder "man"}/share/man"
|
||||
"libdir=${placeholder "lib"}/lib"
|
||||
"pkgconfig_dir=${placeholder "lib"}/lib/pkgconfig"
|
||||
"includedir=${placeholder "dev"}/include"
|
||||
"BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "User-space tools for the Linux kernel ftrace subsystem";
|
||||
homepage = "https://kernelshark.org/";
|
||||
homepage = "https://www.trace-cmd.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ thoughtpolice basvandijk ];
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b034042..b8a06bc 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -338,6 +338,7 @@ libtracefs.a: $(LIBTRACEFS_STATIC)
|
||||
libtracefs.so: $(LIBTRACEFS_SHARED)
|
||||
|
||||
libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACEFS_SHARED)
|
||||
+libs: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC)
|
||||
|
||||
test: force $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC) $(LIBTRACECMD_STATIC)
|
||||
ifneq ($(CUNIT_INSTALLED),1)
|
||||
@@ -414,6 +415,9 @@ install_libs: libs
|
||||
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
|
||||
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
|
||||
$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
|
||||
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
|
||||
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
|
||||
+ $(Q)$(call do_install,$(LIBTRACEFS_STATIC),$(libdir_SQ)/tracefs)
|
||||
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
|
||||
$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
|
||||
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
|
||||
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
|
||||
index 457c100..687e150 100644
|
||||
--- a/kernel-shark/src/CMakeLists.txt
|
||||
+++ b/kernel-shark/src/CMakeLists.txt
|
||||
@@ -92,7 +92,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
|
||||
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
|
||||
|
||||
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"
|
||||
- DESTINATION /usr/share/polkit-1/actions/)
|
||||
+ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
|
||||
|
||||
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
|
||||
DESTINATION ${_INSTALL_PREFIX}/bin/)
|
||||
@ -1,40 +1,31 @@
|
||||
{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
|
||||
{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc
|
||||
, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config
|
||||
, libtraceevent, libtracefs, freefont_ttf
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kernelshark";
|
||||
version = "1.2";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
|
||||
rev = "kernelshark-v${version}";
|
||||
sha256 = "0wzzm2imk9n94v96v6sbvbff6j47lz4qj0snhiyv3nj3slg0anvh";
|
||||
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/";
|
||||
rev = "kernelshark-v${version}";
|
||||
sha256 = "0vy5wa1kccrxr973l870jy5hl6lac7sk3zyg3hxrwmivin1yf0cv";
|
||||
};
|
||||
|
||||
patches = [ ./fix-Makefiles.patch ];
|
||||
outputs = [ "out" ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
preConfigure = "pushd kernel-shark";
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake asciidoc ];
|
||||
|
||||
buildInputs = [ qtbase json_c mesa_glu freeglut ];
|
||||
buildInputs = [ qtbase json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-D_INSTALL_PREFIX=${placeholder "out"}"
|
||||
"-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
|
||||
"-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
|
||||
"-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a"
|
||||
"-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a"
|
||||
"-DTRACEFS_LIBRARY=${trace-cmd.lib}/lib/tracefs/libtracefs.a"
|
||||
"-D_POLKIT_INSTALL_PREFIX=${placeholder "out"}"
|
||||
"-DPKG_CONGIG_DIR=${placeholder "out"}/lib/pkgconfig"
|
||||
"-DTT_FONT_FILE=${freefont_ttf}/share/fonts/truetype/FreeSans.ttf"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
popd
|
||||
make install_doc_gui prefix=$doc \
|
||||
FIND_MANPAGE_DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl
|
||||
pushd kernel-shark/build
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem";
|
||||
homepage = "https://kernelshark.org/";
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "moonraker";
|
||||
version = "unstable-2021-10-03";
|
||||
version = "unstable-2021-10-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arksine";
|
||||
repo = "moonraker";
|
||||
rev = "c3f1b290f8667f771f2d58a3f012e87853c4e85c";
|
||||
sha256 = "a49sVvgzpGHrjWbSH6GiH5kGeXm1LrLgd+lKv7Xxi9w=";
|
||||
rev = "562f971c3d039fb3a8a1d7f8362e34a15d851b62";
|
||||
sha256 = "ruutyDeR79X13+LkhkHHymxHMZjGY2mde5YT1J9CNDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
|
||||
, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
|
||||
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
|
||||
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
|
||||
, radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
|
||||
, e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
|
||||
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
|
||||
, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd
|
||||
, enableBloat ? false
|
||||
}:
|
||||
|
||||
@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
|
||||
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
|
||||
#
|
||||
# Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
|
||||
# Still missing these tools: docx2txt lipo otool r2pipe
|
||||
pythonPath = [
|
||||
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
|
||||
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
|
||||
@ -53,9 +53,9 @@ python3Packages.buildPythonApplication rec {
|
||||
])
|
||||
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
|
||||
++ lib.optionals enableBloat ([
|
||||
abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
|
||||
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
|
||||
] ++ (with python3Packages; [ binwalk guestfs h5py ]));
|
||||
abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
|
||||
hdf5 imagemagick llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
|
||||
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ]));
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
|
||||
|
||||
|
||||
35
pkgs/tools/misc/enjarify/default.nix
Normal file
35
pkgs/tools/misc/enjarify/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enjarify";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-VDBC5n2jWLNJsilX+PV1smL5JeBDj23jYFRwdObXwYs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
pypath="$out/${python3.sitePackages}"
|
||||
mkdir -p $out/bin $pypath
|
||||
mv enjarify $pypath
|
||||
|
||||
cat << EOF > $out/bin/enjarify
|
||||
#!${runtimeShell}
|
||||
export PYTHONPATH=$pypath
|
||||
exec ${python3.interpreter} -O -m enjarify.main "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/enjarify
|
||||
'';
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for translating Dalvik bytecode to equivalent Java bytecode";
|
||||
homepage = "https://github.com/google/enjarify/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
26
pkgs/tools/misc/oggvideotools/default.nix
Normal file
26
pkgs/tools/misc/oggvideotools/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, boost, gd, libogg, libtheora, libvorbis }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oggvideotools";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/oggvideotools/oggvideotools/oggvideotools-${version}/oggvideotools-${version}.tar.bz2";
|
||||
sha256 = "sha256-2dv3iXt86phhIgnYC5EnRzyX1u5ssNzPwrOP4+jilSM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-compile.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ boost gd libogg libtheora libvorbis ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Toolbox for manipulating and creating Ogg video files";
|
||||
homepage = "http://www.streamnik.de/oggvideotools.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
10
pkgs/tools/misc/oggvideotools/fix-compile.patch
Normal file
10
pkgs/tools/misc/oggvideotools/fix-compile.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- oggvideotools-0.9.1/src/base/test/decoderTest.cpp 2016-09-05 10:35:14.000000000 +0200
|
||||
+++ oggvideotools-0.9.1/src/base/test/decoderTest.cpp 2021-10-22 22:42:48.980473419 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "oggDecoder.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
31
pkgs/tools/misc/procyon/default.nix
Normal file
31
pkgs/tools/misc/procyon/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, stdenv, fetchurl, runtimeShell, jre_headless }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "procyon";
|
||||
version = "0.6-prerelease";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mstrobel/procyon/releases/download/${version}/procyon-decompiler-${version}.jar";
|
||||
sha256 = "sha256-eBVWKCo8ccAT/T9HgjxUCNFzGyzofc9Mbyp0ldUmrdk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/procyon
|
||||
cp $src $out/share/procyon/procyon-decompiler.jar
|
||||
|
||||
cat << EOF > $out/bin/procyon
|
||||
#!${runtimeShell}
|
||||
exec ${jre_headless}/bin/java -jar $out/share/procyon/procyon-decompiler.jar "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/procyon
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Procyon is a suite of Java metaprogramming tools including a Java decompiler";
|
||||
homepage = "https://github.com/mstrobel/procyon/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "5.3.5";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xJ7kgEvIsTufAZa5x3YpElTc74nEs9C+baVjbheHySM=";
|
||||
sha256 = "1pi9dbjhd2mj11p3hx74f3rr8ysriq7sy2x012r0kil3b5xzpv2p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name pspg.bash bash-completion.sh
|
||||
installShellCompletion --bash --cmd pspg bash-completion.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
39
pkgs/tools/misc/xmlbeans/default.nix
Normal file
39
pkgs/tools/misc/xmlbeans/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib, stdenv, fetchzip, jre_headless }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlbeans";
|
||||
version = "5.0.2-20211014";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip";
|
||||
sha256 = "sha256-1o0kfBMhka/Midtg+GzpVDDygixL6mrfxtY5WrjLN+0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm bin/*.cmd
|
||||
substituteInPlace bin/dumpxsb \
|
||||
--replace 'echo `dirname $0`' ""
|
||||
|
||||
substituteInPlace bin/_setlib \
|
||||
--replace 'echo XMLBEANS_LIB=$XMLBEANS_LIB' ""
|
||||
|
||||
for file in bin/*; do
|
||||
substituteInPlace $file \
|
||||
--replace "java " "${jre_headless}/bin/java "
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
chmod +x bin/*
|
||||
cp -r bin/ lib/ $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Java library for accessing XML by binding it to Java types";
|
||||
homepage = "https://xmlbeans.apache.org/";
|
||||
downloadPage = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -20,12 +20,12 @@ buildPythonPackage rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2021.10.10";
|
||||
version = "2021.10.22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname;
|
||||
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
|
||||
sha256 = "sha256-zJYhHo5V67tI0uZgnA0JQlB+tUcbLOdOOPe5X41wpOc=";
|
||||
sha256 = "sha256-okuWZr0iNBSeTajE8Wu45fdGwpQo0S7gT8HBG1JHowc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ websockets mutagen ]
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vopono";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0dsyav755mggnsybj7iwvdqbqzz0gfd3j9vh0hmg5b7pbffanzvy";
|
||||
sha256 = "0kpkvnw12cvcswsx2p8xicyn57i5fd7p5d7n1dqq9x18q6am181p";
|
||||
};
|
||||
|
||||
cargoHash = "sha256:187mi36dgr2f1klqclci175zqgyrm0b6awrcnav63vira7hqz076";
|
||||
cargoHash = "sha256:1y07iazb7rwgs0viwn81qmwbcnxza9n89w2jh0r4fq98rr337081";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run applications through VPN connections in network namespaces";
|
||||
|
||||
@ -1273,6 +1273,8 @@ with pkgs;
|
||||
|
||||
artyFX = callPackage ../applications/audio/artyFX {};
|
||||
|
||||
oggvideotools = callPackage ../tools/misc/oggvideotools { };
|
||||
|
||||
owl-lisp = callPackage ../development/compilers/owl-lisp {};
|
||||
|
||||
ascii = callPackage ../tools/text/ascii { };
|
||||
@ -1628,6 +1630,8 @@ with pkgs;
|
||||
|
||||
enchive = callPackage ../tools/security/enchive { };
|
||||
|
||||
enjarify = callPackage ../tools/misc/enjarify { };
|
||||
|
||||
enpass = callPackage ../tools/security/enpass { };
|
||||
|
||||
esbuild = callPackage ../development/tools/esbuild { };
|
||||
@ -3420,6 +3424,8 @@ with pkgs;
|
||||
inherit (darwin) libiconv;
|
||||
};
|
||||
|
||||
procyon = callPackage ../tools/misc/procyon { };
|
||||
|
||||
profetch = callPackage ../tools/misc/profetch { };
|
||||
|
||||
psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
|
||||
@ -3571,6 +3577,8 @@ with pkgs;
|
||||
libmaxminddb = null;
|
||||
};
|
||||
|
||||
xmlbeans = callPackage ../tools/misc/xmlbeans { };
|
||||
|
||||
xmlsort = perlPackages.XMLFilterSort;
|
||||
|
||||
xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { };
|
||||
@ -15496,6 +15504,8 @@ with pkgs;
|
||||
|
||||
aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { };
|
||||
|
||||
aws-c-sdkutils = callPackage ../development/libraries/aws-c-sdkutils { };
|
||||
|
||||
aws-checksums = callPackage ../development/libraries/aws-checksums { };
|
||||
|
||||
aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { };
|
||||
@ -21841,6 +21851,10 @@ with pkgs;
|
||||
|
||||
libnl = callPackage ../os-specific/linux/libnl { };
|
||||
|
||||
libtraceevent = callPackage ../os-specific/linux/libtraceevent {};
|
||||
|
||||
libtracefs = callPackage ../os-specific/linux/libtracefs {};
|
||||
|
||||
lieer = callPackage ../applications/networking/lieer {};
|
||||
|
||||
linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
|
||||
@ -26783,6 +26797,10 @@ with pkgs;
|
||||
|
||||
qemacs = callPackage ../applications/editors/qemacs { };
|
||||
|
||||
rqbit = callPackage ../applications/networking/p2p/rqbit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
|
||||
|
||||
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user