mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-20 00:01:47 +00:00 committed by GitHub
parent 12e2b98017 51f6c77e0c
commit fcf9b87af0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 192 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
nixos/modules/services/misc/klipper.nix
View file

@ -2,7 +2,6 @@
with lib;
let
cfg = config.services.klipper;
package = pkgs.klipper;
format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; };
in
{
@ -11,12 +10,51 @@ in
services.klipper = {
enable = mkEnableOption "Klipper, the 3D printer firmware";
package = mkOption {
type = types.package;
default = pkgs.klipper;
description = "The Klipper package.";
};
inputTTY = mkOption {
type = types.path;
default = "/run/klipper/tty";
description = "Path of the virtual printer symlink to create.";
};
apiSocket = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/klipper/api";
description = "Path of the API socket to create.";
};
octoprintIntegration = mkOption {
type = types.bool;
default = false;
description = "Allows Octoprint to control Klipper.";
};
user = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
User account under which Klipper runs.
If null is specified (default), a temporary user will be created by systemd.
'';
};
group = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Group account under which Klipper runs.
If null is specified (default), a temporary user will be created by systemd.
'';
};
settings = mkOption {
type = format.type;
default = { };
@ -30,26 +68,40 @@ in
##### implementation
config = mkIf cfg.enable {
assertions = [{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}];
assertions = [
{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}
{
assertion = cfg.user != null -> cfg.group != null;
message = "Option klipper.group is not set when a user is specified.";
}
];
environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings;
systemd.services.klipper = {
services.klipper = mkIf cfg.octoprintIntegration {
user = config.services.octoprint.user;
group = config.services.octoprint.group;
};
systemd.services.klipper = let
klippyArgs = "--input-tty=${cfg.inputTTY}"
+ optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}";
in {
description = "Klipper 3D Printer Firmware";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg";
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg";
RuntimeDirectory = "klipper";
SupplementaryGroups = [ "dialout" ];
WorkingDirectory = "${package}/lib";
} // (if cfg.octoprintIntegration then {
Group = config.services.octoprint.group;
User = config.services.octoprint.user;
WorkingDirectory = "${cfg.package}/lib";
} // (if cfg.user != null then {
Group = cfg.group;
User = cfg.user;
} else {
DynamicUser = true;
User = "klipper";

10
nixos/modules/services/ttys/getty.nix
View file

@ -6,7 +6,7 @@ let
cfg = config.services.getty;
baseArgs = [
"--login-program" "${pkgs.shadow}/bin/login"
"--login-program" "${cfg.loginProgram}"
] ++ optionals (cfg.autologinUser != null) [
"--autologin" cfg.autologinUser
] ++ optionals (cfg.loginOptions != null) [
@ -39,6 +39,14 @@ in
'';
};
loginProgram = mkOption {
type = types.path;
default = "${pkgs.shadow}/bin/login";
description = ''
Path to the login binary executed by agetty.
'';
};
loginOptions = mkOption {
type = types.nullOr types.str;
default = null;

4
pkgs/applications/blockchains/dogecoin.nix
View file

@ -7,13 +7,13 @@
with lib;
stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "1.14.2";
version = "1.14.3";
src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

6
pkgs/applications/misc/joplin-desktop/default.nix
View file

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.8.5";
version = "2.1.9";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny";
x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952";
x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9";
x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8";
}.${system} or throwSystem;
};

16
pkgs/applications/science/logic/boolector/default.nix
View file

@ -1,26 +1,18 @@
{ stdenv, fetchFromGitHub, fetchpatch, lib, python3
{ stdenv, fetchFromGitHub, lib, python3
, cmake, lingeling, btor2tools, gtest, gmp
}:
stdenv.mkDerivation rec {
pname = "boolector";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "boolector";
repo = "boolector";
rev = "refs/tags/${version}";
sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci";
rev = version;
sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";
};
# excludes development artifacts from install, will be included in next release
patches = [
(fetchpatch {
url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch";
sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw";
})
];
postPatch = ''
sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1
'';

4
pkgs/development/python-modules/apache-airflow/default.nix
View file

@ -65,13 +65,13 @@
}:
let
version = "2.1.1rc1";
version = "2.1.2";
airflow-src = fetchFromGitHub rec {
owner = "apache";
repo = "airflow";
rev = version;
sha256 = "1vzzmcfgqni9rkf7ggh8mswnm3ffwaishcz1ysrwx0a96ilhm9q2";
sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk=";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.

6
pkgs/development/python-modules/rtoml/default.nix
View file

@ -9,20 +9,20 @@
buildPythonPackage rec {
pname = "rtoml";
version = "0.6.1";
version = "0.7";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy";
sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy";
sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j";
};
nativeBuildInputs = with rustPlatform; [

4
pkgs/development/python-modules/uncertainties/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "uncertainties";
version = "3.1.5";
version = "3.1.6";
src = fetchPypi {
inherit pname version;
sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li";
sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw";
};
propagatedBuildInputs = [ future ];

4
pkgs/development/tools/bazelisk/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE=";
sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8=";
};
vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU=";

20
pkgs/games/openrct2/default.nix
View file

@ -5,13 +5,13 @@
}:
let
version = "0.3.3";
version = "0.3.4";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76";
sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4";
};
objects-src = fetchFromGitHub {
@ -29,8 +29,8 @@ let
};
in
stdenv.mkDerivation {
inherit version;
pname = "openrct2";
inherit version;
src = openrct2-src;
@ -58,22 +58,22 @@ stdenv.mkDerivation {
zlib
];
postUnpack = ''
cp -r ${objects-src} $sourceRoot/data/object
cp -r ${title-sequences-src} $sourceRoot/data/sequence
'';
cmakeFlags = [
"-DDOWNLOAD_OBJECTS=OFF"
"-DDOWNLOAD_TITLE_SEQUENCES=OFF"
];
postUnpack = ''
cp -r ${objects-src} $sourceRoot/data/object
cp -r ${title-sequences-src} $sourceRoot/data/sequence
'';
preFixup = "ln -s $out/share/openrct2 $out/bin/data";
meta = with lib; {
description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
homepage = "https://openrct2.io/";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ oxzi ];
};

150
pkgs/misc/vim-plugins/generated.nix
View file

@ -101,12 +101,12 @@ final: prev:
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2021-05-31";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
rev = "4ca3d418eebc0da452b7defc18970c83f7de5070";
sha256 = "0ax3hfwppbkm7haxvsllac6r4zk2ys9rrj7sj4p3ayl1w8v3n8nq";
rev = "c15c4e49d6ecb7ad7252902bb1b4310ba161617a";
sha256 = "13pnlx4rqjc51vrq9d8kyjjxb2apw3y6j2xh68ii746klinjpjy5";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-18";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "384925e0cfa87a27387357cab144fbf392e21f61";
sha256 = "01bg8h7276nidrgdgz6asvksi3m0g6jf8aw9bp0d4ng6s0gdfps2";
rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466";
sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -786,12 +786,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2021-06-13";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "b55e4906a10db0f6917058aec6616075c4d06994";
sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm";
rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d";
sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@ -822,12 +822,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
version = "2021-06-30";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17";
sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861";
rev = "9c1aa175762884812b9f3c3436ef6e26639b9589";
sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@ -1316,12 +1316,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
version = "2021-07-04";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "1936824f5986c986befad5995e7bf87ba124d109";
sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix";
rev = "63d7052686732a910b7355761193fdb55a521cd3";
sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -1388,12 +1388,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
version = "2021-07-12";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
rev = "0aad4037902271c8c85d00d02e77f79ec2141267";
sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4";
rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2";
sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@ -1859,12 +1859,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "f29e8a461e05881c69953b41784a1aeb4b70a422";
sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj";
rev = "66638c929c61f950246f3d292b6157a9596241de";
sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2195,12 +2195,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
version = "2021-07-03";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe";
sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6";
rev = "0257caac96b28ec9efd80a00c13d31c469357f5b";
sha256 = "0r5c99xzsizqpk4h35lp3ip8lqang2vvg01vrv0bad3wqnjqq1d7";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@ -2676,12 +2676,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "29e685953d362c723c55417eea2b795b5bcc2ef5";
sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj";
rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e";
sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -3492,12 +3492,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-07-14";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d";
sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc";
rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066";
sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3708,12 +3708,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-07-17";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3";
sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg";
rev = "38e0003d0c40d506e9e46ff55978b78220a76b71";
sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3804,12 +3804,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-18";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "9144ea1107ed5aaf250bffafc1f0f32fb97cce47";
sha256 = "05apxyy0xg6llskigirglb4a73ay8cdaw2rckl2g3d6j8ry9dkc4";
rev = "17cf76de8a16c1e459fbe916491f258371837a8d";
sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3864,12 +3864,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "4887eb7526004e069bd8898041a714c7eaad72e7";
sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d";
rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c";
sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -4694,12 +4694,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
version = "2021-07-12";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace";
sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y";
rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd";
sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@ -4827,12 +4827,12 @@ final: prev:
srcery-vim = buildVimPluginFrom2Nix {
pname = "srcery-vim";
version = "2021-06-01";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
rev = "93711180123b9ba6958bfc682d305ef0a1056fa5";
sha256 = "1i3hhihlvh5mkn1vl9f1baiz712h8lwp1hfi5arsb36picsmgbfd";
rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc";
sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@ -4923,12 +4923,12 @@ final: prev:
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-07-01";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
rev = "c89741ef310fd0a380ffb80b80e10f197afd6224";
sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh";
rev = "7414f30365a342e1d89072d474a35913643b6eec";
sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@ -4958,6 +4958,18 @@ final: prev:
meta.homepage = "https://github.com/codota/tabnine-vim/";
};
taboo-vim = buildVimPluginFrom2Nix {
pname = "taboo-vim";
version = "2019-08-27";
src = fetchFromGitHub {
owner = "gcmt";
repo = "taboo.vim";
rev = "caf948187694d3f1374913d36f947b3f9fa1c22f";
sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99";
};
meta.homepage = "https://github.com/gcmt/taboo.vim/";
};
tabpagebuffer-vim = buildVimPluginFrom2Nix {
pname = "tabpagebuffer-vim";
version = "2014-09-30";
@ -5117,24 +5129,24 @@ final: prev:
telescope-z-nvim = buildVimPluginFrom2Nix {
pname = "telescope-z-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-z.nvim";
rev = "27694fa19bc00cc24b436d671951f516a4a966a1";
sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9";
rev = "f5776dbd0c687af0862b2e4ee83c62c5f4a7271d";
sha256 = "08lcszv53d9mqhgdwkdygbnk5w0pyh0q6djxzqhnjb6qphibf3m6";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/";
};
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-07-18";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "8c3f2b630be0241fe10709e61ee9dab473518f32";
sha256 = "1yd1kkdp8baxrhkfsg0j0dpkprxvwi0r4xljjcdln7rpr2r0lm82";
rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461";
sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -6006,12 +6018,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "ee390feaa3bc40de2afa32910ab09de287181146";
sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz";
rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f";
sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -7351,12 +7363,12 @@ final: prev:
vim-jinja = buildVimPluginFrom2Nix {
pname = "vim-jinja";
version = "2016-11-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lepture";
repo = "vim-jinja";
rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f";
sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22";
};
meta.homepage = "https://github.com/lepture/vim-jinja/";
};
@ -7713,12 +7725,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-07-05";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43";
sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm";
rev = "61802ad25f303dc37f575cbed9b902605353db49";
sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -9490,12 +9502,12 @@ final: prev:
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
version = "2021-06-10";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9";
sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v";
rev = "e1be98dc050b8c5196e324cb4236e8c4b44483e6";
sha256 = "12gr0v2r91q75v1wfrskp330zlyibshngs11if9nlxpnhgz8f6dn";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
@ -9695,12 +9707,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-07-15";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "13fac7d1d820ee4d72196841800705f149af9868";
sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb";
rev = "830659752b8914f6b4567a00448901246e4d1841";
sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -161,6 +161,7 @@ fruit-in/vim-nong-theme
fsharp/vim-fsharp
fszymanski/deoplete-emoji
garbas/vim-snipmate
gcmt/taboo.vim
gcmt/wildfire.vim
gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax

10
pkgs/servers/klipper/default.nix
View file

@ -5,14 +5,14 @@
, unstableGitUpdater
}:
stdenv.mkDerivation rec {
name = "klipper";
version = "unstable-2021-01-31";
pname = "klipper";
version = "unstable-2021-07-15";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3";
sha256 = "sha256-puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA=";
rev = "dafb74e3aba707db364ed773bb2135084ac0fffa";
sha256 = "sha256-wF5I8Mo89ohhysBRDMtkCDbCW9SKWrdYdbifmxCPJBc=";
};
# We have no LTO on i686 since commit 22284b0
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The Klipper 3D printer firmware";
homepage = "https://github.com/KevinOConnor/klipper";
maintainers = with maintainers; [ lovesegfault ];
maintainers = with maintainers; [ lovesegfault zhaofengli ];
platforms = platforms.linux;
license = licenses.gpl3Only;
};

4
pkgs/tools/admin/azure-cli/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
version = "2.26.0";
version = "2.26.1";
srcName = "azure-cli-${version}-src";
src = fetchFromGitHub {
@ -9,7 +9,7 @@ let
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY=";
sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ=";
};
# put packages that needs to be overriden in the py package scope

6
pkgs/tools/system/bottom/default.nix
View file

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q=";
sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI=";
};
prePatch = ''
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38=";
cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4=";
doCheck = false;