Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
402b752521
35 changed files with 200 additions and 139 deletions
|
|
@ -300,7 +300,7 @@ rec {
|
|||
baseConfig = "multi_v7_defconfig";
|
||||
DTB = true;
|
||||
autoModules = true;
|
||||
PreferBuiltin = true;
|
||||
preferBuiltin = true;
|
||||
target = "zImage";
|
||||
extraConfig = ''
|
||||
# Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc=";
|
||||
sha256 = "sha256-310zrxVjUECg/3+ydo9J8EdF0RbguBIT2PklEgpgRFU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
|
||||
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BzOpP34UumGaAL+vc+lkCKBuK8i0zAWzpMLuPszupQI=";
|
||||
sha256 = "sha256-ZIAdYuJ8LS8x2h+VXQrkgdmKkw9VKl7FcnOVZNSnXM0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XOneGFTtoxuHnjGVse15Ypfo7vO3ReeGs46qLG619aM=";
|
||||
vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q=";
|
||||
|
||||
subPackages = [ "cmd/starboard" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ let
|
|||
# Packages that don't fit the default model
|
||||
ansible = callPackage ./ansible {};
|
||||
cloudfoundry = callPackage ./cloudfoundry {};
|
||||
elasticsearch = callPackage ./elasticsearch {};
|
||||
gandi = callPackage ./gandi {};
|
||||
hcloud = callPackage ./hcloud {};
|
||||
keycloak = callPackage ./keycloak {};
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-elasticsearch";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phillbaker";
|
||||
repo = "terraform-provider-elasticsearch";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v";
|
||||
};
|
||||
|
||||
vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terraform provider for elasticsearch";
|
||||
homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ basvandijk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -70,10 +70,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.20.0",
|
||||
"sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17",
|
||||
"vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji",
|
||||
"version": "3.20.0"
|
||||
"rev": "v3.27.0",
|
||||
"sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd",
|
||||
"vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s",
|
||||
"version": "3.27.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -287,6 +287,15 @@
|
|||
"sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"elasticsearch": {
|
||||
"owner": "phillbaker",
|
||||
"provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
|
||||
"repo": "terraform-provider-elasticsearch",
|
||||
"rev": "v1.5.2",
|
||||
"sha256": "1yfmlqab2jb679gbns04sdcjfihzsa0dfp7blhfk3v5zhgv1g7ys",
|
||||
"vendorSha256": "15m9aqb2lqjv6g3k46zyha2m118wpbjrh4ap1bfps0fcxn20qvr5",
|
||||
"version": "1.5.2"
|
||||
},
|
||||
"exoscale": {
|
||||
"owner": "terraform-providers",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
|
|
@ -787,11 +796,13 @@
|
|||
"version": "1.1.8"
|
||||
},
|
||||
"rabbitmq": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "cyrilgdn",
|
||||
"provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq",
|
||||
"repo": "terraform-provider-rabbitmq",
|
||||
"rev": "v1.3.0",
|
||||
"sha256": "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8",
|
||||
"version": "1.3.0"
|
||||
"rev": "v1.5.1",
|
||||
"sha256": "1yxvhzrp63wv5zbzj3ma2745g1marpj32b5h41ha27h0i42498ky",
|
||||
"vendorSha256": null,
|
||||
"version": "1.5.1"
|
||||
},
|
||||
"rancher": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -1042,11 +1053,13 @@
|
|||
"version": "1.0.1"
|
||||
},
|
||||
"vsphere": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vsphere",
|
||||
"repo": "terraform-provider-vsphere",
|
||||
"rev": "v1.18.3",
|
||||
"sha256": "1cvfmkckigi80cvv826m0d8wzd98qny0r5nqpl7nkzz5kybkb5qp",
|
||||
"version": "1.18.3"
|
||||
"rev": "v1.24.3",
|
||||
"sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl",
|
||||
"vendorSha256": null,
|
||||
"version": "1.24.3"
|
||||
},
|
||||
"vthunder": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "365";
|
||||
version = "366";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
sha256 = "142glxr1gfq4v5rzmk9fblipha0x7sgdiwh4vyy4wfw00nqd49yn";
|
||||
sha256 = "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, systemd
|
||||
, yajl
|
||||
, nixosTests
|
||||
, criu
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
|
||||
|
||||
buildInputs = [ libcap libseccomp systemd yajl ];
|
||||
buildInputs = [ criu libcap libseccomp systemd yajl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DENABLE_TESTS=OFF"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
|
||||
"-DCONFIG_RUNTIME_CPU_DETECT=OFF"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ndi";
|
||||
fullVersion = "4.5.3";
|
||||
fullVersion = "4.6.0";
|
||||
version = builtins.head (builtins.splitVersion fullVersion);
|
||||
|
||||
src = requireFile rec {
|
||||
name = "InstallNDISDK_v${version}_Linux.tar.gz";
|
||||
sha256 = "0w9f4a4a3xzg0nvmvrlda1wwkyi0m5aqvk07immmwgg7f1z1sqj5";
|
||||
sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m";
|
||||
message = ''
|
||||
In order to use NDI SDK version ${fullVersion}, you need to comply with
|
||||
NewTek's license and download the appropriate Linux tarball from:
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.3.24";
|
||||
version = "0.3.25";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j";
|
||||
sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ in buildPythonPackage {
|
|||
};
|
||||
|
||||
buildInputs = [ precis-i18n ];
|
||||
checkInputs = [ gobject-introspection libsoup pygobject3 ];
|
||||
propagatedBuildInputs = [ idna pyopenssl ];
|
||||
propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "precis-i18n";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "precis_i18n";
|
||||
inherit version;
|
||||
sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "byllyfish";
|
||||
repo = "precis_i18n";
|
||||
rev = "v${version}";
|
||||
hash = "sha256:1r9pah1kgik6valf15ac7ybw0szr92cq84kwjvm6mq3z46j1pmkr";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, asyncio-dgram
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywizlight";
|
||||
version = "0.4.1";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbidy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kyhyda28zbni9sjv6kvky6wlhqldl47niddgpbjsv5dlb9xvxns";
|
||||
sha256 = "139jnmyyfd8cq0xnxqbffkyjmy79gcpiwqmcn2dy27nz3608c1qv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -21,13 +23,24 @@ buildPythonPackage rec {
|
|||
click
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests requires network features (e. g., discovery testing)
|
||||
disabledTests = [
|
||||
"test_Bulb_Discovery"
|
||||
"test_timeout"
|
||||
"test_timeout_PilotBuilder"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pywizlight" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python connector for WiZ light bulbs";
|
||||
homepage = "https://github.com/sbidy/pywizlight";
|
||||
changelog = "https://github.com/sbidy/pywizlight/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.263.3";
|
||||
version = "2.263.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "0lyzmv378yjz4p4dlpm1nwdq4p781nycvspdik82xbxg4s6gamd3";
|
||||
sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2021.02.07-22.51.26";
|
||||
version = "2021.02.10-21.13.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
|
||||
sha256 = "sha256-6EiWyoH7voRjjDNWnWkyBV2eOPuoabRE7Os/JRE/LUk=";
|
||||
sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ in
|
|||
lib.makeScope pkgs.newScope (self: {
|
||||
|
||||
# Poetry2nix version
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
/* Returns a package of editable sources whose changes will be available without needing to restart the
|
||||
nix-shell.
|
||||
|
|
|
|||
|
|
@ -81,6 +81,10 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
celery = super.celery.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ];
|
||||
});
|
||||
|
||||
cssselect2 = super.cssselect2.overridePythonAttrs (
|
||||
old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
|
||||
|
|
@ -135,6 +139,12 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
daphne = super.daphne.overridePythonAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' ""
|
||||
'';
|
||||
});
|
||||
|
||||
datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "setuptools==" "setuptools>="
|
||||
|
|
@ -142,6 +152,10 @@ self: super:
|
|||
buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ];
|
||||
});
|
||||
|
||||
dcli = super.dcli.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
|
||||
});
|
||||
|
||||
ddtrace = super.ddtrace.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++
|
||||
(pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ];
|
||||
|
|
@ -364,6 +378,11 @@ self: super:
|
|||
}
|
||||
);
|
||||
|
||||
jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
|
||||
buildInputs = old.buildInputs ++ [ pkgs.yajl ];
|
||||
});
|
||||
|
||||
jupyter = super.jupyter.overridePythonAttrs (
|
||||
old: rec {
|
||||
# jupyter is a meta-package. Everything relevant comes from the
|
||||
|
|
|
|||
|
|
@ -96,5 +96,5 @@ in self // {
|
|||
license = lib.licenses.free;
|
||||
hydraPlatforms = [ ];
|
||||
} // meta;
|
||||
});
|
||||
} // extraArgs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -918,12 +918,12 @@ let
|
|||
|
||||
denite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "denite-nvim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "denite.nvim";
|
||||
rev = "8de12f27d51e2574217148191f607a00b1575ec7";
|
||||
sha256 = "0skn2fjlazm4bfmimb8qmyn6bjq01kqxaf88qggxwfk5l2sv3krj";
|
||||
rev = "b7e15bbf2f6ad83309d9799350b1b16c21faff6b";
|
||||
sha256 = "1jsh4iphrnmi7nahci5bpzi4zb0g8bmdv5zh12im77jys3q21q6w";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/denite.nvim/";
|
||||
};
|
||||
|
|
@ -1571,12 +1571,12 @@ let
|
|||
|
||||
git-messenger-vim = buildVimPluginFrom2Nix {
|
||||
pname = "git-messenger-vim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "git-messenger.vim";
|
||||
rev = "04beaee235cca4304c4b655820c83d3661610220";
|
||||
sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl";
|
||||
rev = "ae0c39167c83507c6c257cd13268c98b8066cb50";
|
||||
sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
|
||||
};
|
||||
|
|
@ -2268,12 +2268,12 @@ let
|
|||
|
||||
lspsaga-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "985bcf31ad7b4fe955b02ce17bb844efb712aa22";
|
||||
sha256 = "00zi3yjkfpsza5bzc0i2pwsz7jsfsnvwcawb4pxfndn5v77jb050";
|
||||
rev = "284b357137c3c57ff3716e07c865477788ab8e6d";
|
||||
sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
|
||||
};
|
||||
|
|
@ -2352,12 +2352,12 @@ let
|
|||
|
||||
minimap-vim = buildVimPluginFrom2Nix {
|
||||
pname = "minimap-vim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "minimap.vim";
|
||||
rev = "1964f5e56467be5f894c8a9c99db58794da38b36";
|
||||
sha256 = "141p9hc343cgivp76bihv2l45l0yvznv2f2m9ndy3kdsh0ckwk0w";
|
||||
rev = "05a9ef7981ff6438e3de5e30323474092badccb8";
|
||||
sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78";
|
||||
};
|
||||
meta.homepage = "https://github.com/wfxr/minimap.vim/";
|
||||
};
|
||||
|
|
@ -2808,12 +2808,12 @@ let
|
|||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "nerdtree";
|
||||
rev = "d3f9fc44caaa5688b65ccc508af6fac7defa120f";
|
||||
sha256 = "0rdz6li5qj6jl58731ddr3v8anx22ahvaqf5s19lnjakfdip3nn9";
|
||||
rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08";
|
||||
sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/nerdtree/";
|
||||
};
|
||||
|
|
@ -2916,12 +2916,12 @@ let
|
|||
|
||||
nvim-compe = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-compe";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-compe";
|
||||
rev = "3ec1e8c72a77b6c541751ce7b7718642d9528795";
|
||||
sha256 = "09j7salzbxmkqjvvilnhx8jysvf796bkx9f1an0p0vkn1slcfi7n";
|
||||
rev = "bef454eecc11fb13e5bc3f29f443f495904470ef";
|
||||
sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
|
||||
};
|
||||
|
|
@ -3058,6 +3058,18 @@ let
|
|||
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
|
||||
};
|
||||
|
||||
nvim-peekup = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-peekup";
|
||||
version = "2021-02-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gennaro-tedesco";
|
||||
repo = "nvim-peekup";
|
||||
rev = "95492e20139dcd911d6a1932bbe435010b87c6e7";
|
||||
sha256 = "1q1ksr2v17nvar48gmixigc72xw8r5k6gd4q3h002hr8lnhfm1xp";
|
||||
};
|
||||
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
|
||||
};
|
||||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2021-01-09";
|
||||
|
|
@ -3096,12 +3108,12 @@ let
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "72ecefc859096cdea114f78ca09ad67970f8a1d8";
|
||||
sha256 = "0jyq6qd7ykkdm4s1m6whmj0g4n1b4xvlhwiizim9vv2m86lnwfqb";
|
||||
rev = "76a7000384aec0a94c6a4b0031a1bde0909b7ac4";
|
||||
sha256 = "0fg5mra0c3s3lgk454130b7n8sky48cgnmfdmpz7b4pgsxyx7iw0";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -5644,12 +5656,12 @@ let
|
|||
|
||||
vim-gitgutter = buildVimPluginFrom2Nix {
|
||||
pname = "vim-gitgutter";
|
||||
version = "2021-02-08";
|
||||
version = "2021-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "airblade";
|
||||
repo = "vim-gitgutter";
|
||||
rev = "d249be7f3c04fe1970f8a50d1c219f1112f18676";
|
||||
sha256 = "1y40zjnvvn4qkg5wdp906a71fnk5dnnk2p2dl3igd0bcxswvqqwf";
|
||||
rev = "2e3cd54ed696500bb3722226f2103d4b279272c0";
|
||||
sha256 = "1cv9lapq6xb0fq5i1mfbhv5qlab868mvby60yhwzafni5b2p9l37";
|
||||
};
|
||||
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
|
||||
};
|
||||
|
|
@ -8255,12 +8267,12 @@ let
|
|||
pname = "vimux";
|
||||
version = "2017-10-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "benmills";
|
||||
owner = "ostera";
|
||||
repo = "vimux";
|
||||
rev = "37f41195e6369ac602a08ec61364906600b771f1";
|
||||
sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra";
|
||||
};
|
||||
meta.homepage = "https://github.com/benmills/vimux/";
|
||||
meta.homepage = "https://github.com/ostera/vimux/";
|
||||
};
|
||||
|
||||
vimwiki = buildVimPluginFrom2Nix {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ bakpakin/fennel.vim
|
|||
bazelbuild/vim-bazel
|
||||
bbchung/clighter8
|
||||
benizi/vim-automkdir
|
||||
benmills/vimux
|
||||
bhurlow/vim-parinfer
|
||||
bitc/vim-hdevtools
|
||||
bkad/camelcasemotion
|
||||
|
|
@ -129,6 +128,7 @@ fruit-in/vim-nong-theme
|
|||
fsharp/vim-fsharp
|
||||
fszymanski/deoplete-emoji
|
||||
garbas/vim-snipmate
|
||||
gennaro-tedesco/nvim-peekup
|
||||
gentoo/gentoo-syntax
|
||||
GEverding/vim-hocon
|
||||
gfanto/fzf-lsp.nvim@main
|
||||
|
|
@ -432,6 +432,7 @@ Olical/aniseed
|
|||
Olical/conjure
|
||||
onsails/lspkind-nvim
|
||||
OrangeT/vim-csharp
|
||||
ostera/vimux
|
||||
osyo-manga/shabadou.vim
|
||||
osyo-manga/vim-anzu
|
||||
osyo-manga/vim-over
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
{
|
||||
"4.14": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.220-hardened1.patch",
|
||||
"sha256": "083jc9lwr8lwxyfk4r39jcncf2g89srd50crj17jw9ysrp1jpyks",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.220-hardened1/linux-hardened-4.14.220-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.221-hardened1.patch",
|
||||
"sha256": "167pazgz6xa0xmvkqdk0a9z1gp9ria0mm2wmq6g41wzhcy20zrfz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.221-hardened1/linux-hardened-4.14.221-hardened1.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.174-hardened1.patch",
|
||||
"sha256": "1ggh7rjqm68gih41a9z2pzm1wm483165lvmigdp604p152157974",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.174-hardened1/linux-hardened-4.19.174-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.175-hardened1.patch",
|
||||
"sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.14-hardened1.patch",
|
||||
"sha256": "1l84hmwdkyd1nkby0w7vy9j0jhg866bpiw6hriav208dw2r0binx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.14-hardened1/linux-hardened-5.10.14-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.15-hardened1.patch",
|
||||
"sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.96-hardened1.patch",
|
||||
"sha256": "05cb303llr2m5ik5f4v5ykr8ycldkrdb8gvjdr02zm8g0as7agil",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.96-hardened1/linux-hardened-5.4.96-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.97-hardened1.patch",
|
||||
"sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.220";
|
||||
version = "4.14.221";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1qip0c8nvfximgg4fj9xai741cgvi9f141bsps3zmrryjd796i6h";
|
||||
sha256 = "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.174";
|
||||
version = "4.19.175";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1rcy0hfbc3ny52mfrfysknm1q2scqz0g8l28j0qlyw8cx41wgxhg";
|
||||
sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.256";
|
||||
version = "4.4.257";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1z7vfy4h0mjvv0rcvvpb55x5fl16c6cgpcafz5gpjp0pw1p2lva8";
|
||||
sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.256";
|
||||
version = "4.9.257";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "15qlv4m56dzv195xjy4yp8qsrkbmv51vwfg0qcm664hkrb4i32y4";
|
||||
sha256 = "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.14";
|
||||
version = "5.10.15";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0ahxga1jdgn8kxln0pn8j42qxx0dhrhm9vcpwilyjnwb36gvf9zs";
|
||||
sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.96";
|
||||
version = "5.4.97";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1q7mz69wzk1ps5770l9bj556qyndiz2frjjsl7pigsy5brlxwa7p";
|
||||
sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, php }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.7.9";
|
||||
version = "4.8.0";
|
||||
pname = "adminer";
|
||||
|
||||
# not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
|
||||
sha256 = "sha256-V7cPdCcCjFlA3ykWe+F/fUO7+kZiOpqMgP0hHy6WDJE=";
|
||||
sha256 = "sha256-T2LEUoIbFrMta+wP7PNci0QkFYrJZmWP3RP/JzgqUoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/shells/zsh/zsh-system-clipboard/default.nix
Normal file
25
pkgs/shells/zsh/zsh-system-clipboard/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-system-clipboard";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kutsan";
|
||||
repo = "zsh-system-clipboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kutsan/zsh-system-clipboard";
|
||||
description = "A plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ _0qq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -155,9 +155,9 @@ let
|
|||
# Slated for removal in 21.11
|
||||
lib = if config.allowAliases or true then builtins.trace
|
||||
( "Warning: `stdenv.lib` is deprecated and will be removed in the next release."
|
||||
+ " Please use `pkgs.lib` instead."
|
||||
+ " Please use `lib` instead."
|
||||
+ " For more information see https://github.com/NixOS/nixpkgs/issues/108938")
|
||||
lib else throw "`stdenv.lib` is a deprecated alias for `pkgs.lib`";
|
||||
lib else throw "`stdenv.lib` is a deprecated alias for `lib`";
|
||||
|
||||
inherit fetchurlBoot;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, gobject-introspection
|
||||
, gtk2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, pcre
|
||||
, libuuid
|
||||
, libselinux
|
||||
|
|
@ -36,12 +37,11 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
|
||||
"-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
|
||||
# disabled since we currently don't have gtk4 in nixpkgs
|
||||
"-DENABLE_GTK4_IM_MODULE=off"
|
||||
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
gobject-introspection
|
||||
fcitx5
|
||||
pcre
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cht.sh";
|
||||
version = "unstable-2020-08-06";
|
||||
version = "unstable-2021-01-31";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chubin";
|
||||
repo = "cheat.sh";
|
||||
rev = "9f99bec1f0293e84d6d8a990a1940c1422e3b0ce";
|
||||
sha256 = "1n4lgzsgg4502zh113d7pb1hw6bykqx6vpfp8j08z7y5clmdiwa6";
|
||||
rev = "01e579176981356fb90d4aa58fea2d6c273a45a5";
|
||||
sha256 = "0d98v67ajsc80i962myh0j4ph7bn3csk8y9jf8b5rfqd1zg737hb";
|
||||
};
|
||||
|
||||
# Fix ".cht.sh-wrapped" in the help message
|
||||
|
|
@ -36,7 +36,9 @@ stdenv.mkDerivation {
|
|||
--prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/chubin/cheat.sh.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI client for cheat.sh, a community driven cheat sheet";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ buildPythonPackage rec {
|
|||
# The websites youtube-dl 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.02.04.1";
|
||||
version = "2021.02.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0rn8plld2bzmwbcvxxgz3hn24kjyal5kkwbpb5nd4w84mdjkhjqa";
|
||||
sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -9262,6 +9262,8 @@ in
|
|||
|
||||
zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
|
||||
|
||||
zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { };
|
||||
|
||||
zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
|
||||
|
||||
zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue