Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
46a715fb13
40 changed files with 826 additions and 4100 deletions
|
|
@ -2096,6 +2096,16 @@
|
|||
githubId = 25088352;
|
||||
name = "Christian Kögler";
|
||||
};
|
||||
ckie = {
|
||||
email = "nixpkgs-0efe364@ckie.dev";
|
||||
github = "ckiee";
|
||||
githubId = 2526321;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x13E79449C0525215";
|
||||
fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
|
||||
}];
|
||||
name = "ckie";
|
||||
};
|
||||
clkamp = {
|
||||
email = "c@lkamp.de";
|
||||
github = "clkamp";
|
||||
|
|
@ -9695,16 +9705,6 @@
|
|||
githubId = 1312525;
|
||||
name = "Rongcui Dong";
|
||||
};
|
||||
ronthecookie = {
|
||||
name = "Ron B";
|
||||
email = "me@ronthecookie.me";
|
||||
github = "ronthecookie";
|
||||
githubId = 2526321;
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x6F5B32DE5E5FA80C";
|
||||
fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C";
|
||||
}];
|
||||
};
|
||||
roosemberth = {
|
||||
email = "roosembert.palacios+nixpkgs@posteo.ch";
|
||||
github = "roosemberth";
|
||||
|
|
|
|||
45
pkgs/applications/audio/in-formant/default.nix
Normal file
45
pkgs/applications/audio/in-formant/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, cmake, lib, fetchFromGitHub, qt5, fftw, libtorch-bin, portaudio, eigen
|
||||
, xorg, pkg-config, autoPatchelfHook, soxr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "in-formant";
|
||||
version = "2021-06-30";
|
||||
|
||||
# no Qt6 yet, so we're stuck in the last Qt5-supporting commit: https://github.com/NixOS/nixpkgs/issues/108008
|
||||
src = fetchFromGitHub {
|
||||
owner = "in-formant";
|
||||
repo = "in-formant";
|
||||
rev = "e28e628cf5ff0949a7b046d220cc884f6035f31a";
|
||||
sha256 = "sha256-YvtV0wGUNmI/+GGxrIfTk/l8tqUsWgc/LAI17X+AWGI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qtquickcontrols
|
||||
qt5.qtquickcontrols2
|
||||
qt5.qtcharts
|
||||
fftw
|
||||
libtorch-bin
|
||||
portaudio
|
||||
eigen
|
||||
xorg.libxcb
|
||||
soxr
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp in-formant $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A real-time pitch and formant tracking software";
|
||||
homepage = "https://github.com/in-formant/in-formant";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -4,17 +4,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "librespot";
|
||||
version = "0.1.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librespot-org";
|
||||
repo = "librespot";
|
||||
rev = "v${version}";
|
||||
sha256 = "153i9n3qwmmwc29f62cz8nbqrlry16iygvibm1sdnvpf0s6wk5f3";
|
||||
sha256 = "0n7h690gplpp47gdj038g6ncgwr7wvwfkg00cbrbvxhv7kzqqa1f";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "11d64rpq4b5rdxk5wx0hhzgc6mvs6h2br0w3kfncfklp67vn3v4v";
|
||||
cargoSha256 = "0qakvpxvn84ppgs3qlsfan4flqkmjcgs698w25jasx9ymiv8wc3s";
|
||||
|
||||
cargoBuildFlags = with lib; [
|
||||
"--no-default-features"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A boxy 3D model editor powered by Electron";
|
||||
homepage = "https://blockbench.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.ronthecookie ];
|
||||
maintainers = [ maintainers.ckie ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "electron-cash";
|
||||
version = "4.2.4";
|
||||
version = "4.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Electron-Cash";
|
||||
repo = "Electron-Cash";
|
||||
rev = version;
|
||||
sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg=";
|
||||
sha256 = "sha256-ALIrNnhpX46xdQdfJdx/9e/QtdyBEgi5xLrbuOBJR7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.1";
|
||||
version = "1.7.3";
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
name = "session-desktop-appimage-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6";
|
||||
sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
|
||||
|
||||
let
|
||||
name = "${pname}-${version}";
|
||||
pname = "minetime";
|
||||
version = "1.8.10";
|
||||
appimage = fetchurl {
|
||||
url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage";
|
||||
sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw";
|
||||
};
|
||||
extracted = appimageTools.extractType2 {
|
||||
inherit name;
|
||||
src = appimage;
|
||||
};
|
||||
patched = runCommand "minetime-patchelf" {} ''
|
||||
cp -av ${extracted} $out
|
||||
|
||||
x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService
|
||||
chmod +w $x
|
||||
|
||||
patchelf \
|
||||
--set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
--replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
|
||||
$x
|
||||
'';
|
||||
in
|
||||
appimageTools.wrapAppImage rec {
|
||||
inherit name;
|
||||
src = patched;
|
||||
|
||||
profile = ''
|
||||
export LC_ALL=C.UTF-8
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
'';
|
||||
|
||||
multiPkgs = null; # no 32bit needed
|
||||
extraPkgs = ps:
|
||||
appimageTools.defaultFhsEnvArgs.multiPkgs ps
|
||||
++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]);
|
||||
extraInstallCommands = "mv $out/bin/{${name},${pname}}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern, intuitive and smart calendar application";
|
||||
homepage = "https://minetime.ai";
|
||||
license = licenses.unfree;
|
||||
# Should be cross-platform, but for now we just grab the appimage
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav";
|
||||
sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -33,16 +33,15 @@ buildPythonApplication rec {
|
|||
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
|
||||
'';
|
||||
|
||||
postInstallCheck = ''
|
||||
git init
|
||||
test "$($out/bin/git-machete version)" = "git-machete version ${version}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
tests = {
|
||||
version = testVersion {
|
||||
package = git-machete;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ GEM
|
|||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
marcel (1.0.1)
|
||||
marcel (1.0.2)
|
||||
method_source (1.0.0)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.3)
|
||||
|
|
@ -90,12 +90,12 @@ GEM
|
|||
nokogiri (1.11.7)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.20.1)
|
||||
parallel (1.21.0)
|
||||
parser (3.0.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.4.0)
|
||||
puma (5.5.2)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
|
|
@ -120,7 +120,7 @@ GEM
|
|||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
|
|
@ -146,11 +146,11 @@ GEM
|
|||
railties (>= 5.1, < 6.2)
|
||||
roadie (>= 3.1, < 5.0)
|
||||
rotp (6.2.0)
|
||||
rouge (3.26.0)
|
||||
rqrcode (2.0.0)
|
||||
rouge (3.26.1)
|
||||
rqrcode (2.1.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.1.0)
|
||||
rqrcode_core (1.2.0)
|
||||
rubocop (1.12.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.0.0.0)
|
||||
|
|
@ -160,7 +160,7 @@ GEM
|
|||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.10.0)
|
||||
rubocop-ast (1.12.0)
|
||||
parser (>= 3.0.1.1)
|
||||
rubocop-performance (1.10.2)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
|
|
@ -190,8 +190,8 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (2.0.0)
|
||||
webdrivers (4.6.0)
|
||||
unicode-display_width (2.1.0)
|
||||
webdrivers (4.6.1)
|
||||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (>= 3.0, < 4.0)
|
||||
|
|
@ -245,7 +245,7 @@ DEPENDENCIES
|
|||
yard
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.7.3p183
|
||||
ruby 2.7.4p191
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6";
|
||||
sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -301,10 +301,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3";
|
||||
sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default"];
|
||||
|
|
@ -420,10 +420,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
|
||||
sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -470,10 +470,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x";
|
||||
sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.4.0";
|
||||
version = "5.5.2";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -545,10 +545,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
|
||||
sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.4.2";
|
||||
};
|
||||
railties = {
|
||||
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
|
||||
|
|
@ -680,10 +680,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.26.0";
|
||||
version = "3.26.1";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png" "rqrcode_core"];
|
||||
|
|
@ -691,20 +691,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02";
|
||||
sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
rqrcode_core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k";
|
||||
sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
|
|
@ -723,10 +723,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw";
|
||||
sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
|
|
@ -870,10 +870,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m";
|
||||
sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
webdrivers = {
|
||||
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
||||
|
|
@ -881,10 +881,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry";
|
||||
sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
};
|
||||
websocket-driver = {
|
||||
dependencies = ["websocket-extensions"];
|
||||
|
|
|
|||
|
|
@ -240,7 +240,19 @@ rec {
|
|||
binary = crystal_0_36;
|
||||
};
|
||||
|
||||
crystal = crystal_1_0;
|
||||
crystal_1_1 = generic {
|
||||
version = "1.1.1";
|
||||
sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ=";
|
||||
binary = crystal_1_0;
|
||||
};
|
||||
|
||||
crystal_1_2 = generic {
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-38mmsolzmCnv+MFUMc+AEiklDLBHIr/jqXMLzc0nVq4=";
|
||||
binary = crystal_1_1;
|
||||
};
|
||||
|
||||
crystal = crystal_1_2;
|
||||
|
||||
crystal2nix = callPackage ./crystal2nix.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "21.3.4";
|
||||
version = "21.3.5";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
|
||||
sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepdiff";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
# pypi source does not contain all fixtures required for tests
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "seperman";
|
||||
repo = "deepdiff";
|
||||
rev = version;
|
||||
sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w=";
|
||||
sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
77
pkgs/development/python-modules/dragonfly/default.nix
Normal file
77
pkgs/development/python-modules/dragonfly/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, decorator
|
||||
, packaging
|
||||
, pynput
|
||||
, regex
|
||||
, lark-parser
|
||||
, enum34
|
||||
, pyperclip
|
||||
, six
|
||||
, requests
|
||||
, psutil
|
||||
, json-rpc
|
||||
, werkzeug
|
||||
, kaldi-active-grammar
|
||||
, sounddevice
|
||||
, webrtcvad
|
||||
, setuptools
|
||||
, xdotool
|
||||
, wmctrl
|
||||
, xorg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dragonfly";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dictation-toolbox";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "BUbIhc8as/DVx8/4VeQS9emOLGcWFujNCxesSEEBqKQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser'
|
||||
substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
|
||||
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
|
||||
substituteInPlace dragonfly/windows/x11_window.py \
|
||||
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \
|
||||
--replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \
|
||||
--replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
packaging
|
||||
pynput
|
||||
regex
|
||||
lark-parser
|
||||
enum34
|
||||
pyperclip
|
||||
six
|
||||
requests
|
||||
psutil
|
||||
json-rpc
|
||||
werkzeug
|
||||
kaldi-active-grammar # for the Kaldi engine
|
||||
sounddevice
|
||||
webrtcvad
|
||||
setuptools # needs pkg_resources at runtime
|
||||
];
|
||||
|
||||
# Too many tests fail because of the unusual environment or
|
||||
# because of the missing dependencies for some of the engines.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "dragonfly" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech recognition framework allowing powerful Python-based scripting";
|
||||
homepage = "https://github.com/dictation-toolbox/dragonfly";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,156 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 66e6d49..78f7b42 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,23 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.13.0)
|
||||
project(kaldi_binaries)
|
||||
|
||||
-include(ExternalProject)
|
||||
-include(ProcessorCount)
|
||||
-
|
||||
-ProcessorCount(NCPU)
|
||||
-if(NOT NCPU EQUAL 0)
|
||||
- set(MAKE_FLAGS -j${NCPU})
|
||||
-endif()
|
||||
-
|
||||
-set(DST ${PROJECT_SOURCE_DIR}/kaldi_active_grammar/exec)
|
||||
-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- set(DST ${DST}/macos/)
|
||||
-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
- set(DST ${DST}/linux/)
|
||||
-else()
|
||||
- set(DST ${DST}/windows/)
|
||||
-endif()
|
||||
-
|
||||
set(BINARIES
|
||||
tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX}
|
||||
tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX}
|
||||
@@ -29,63 +12,6 @@ set(LIBRARIES
|
||||
src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
)
|
||||
|
||||
-# For MacOS, we handle all the "indirect" shared libraries manually.
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- list(APPEND LIBRARIES
|
||||
- tools/openfst/lib/libfst${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- tools/openfst/lib/libfstscript${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-base${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-chain${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-cudamatrix${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-decoder${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-feat${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-fstext${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-gmm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-hmm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-ivector${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-lat${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-lm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-matrix${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-nnet2${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-nnet3${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-online2${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-rnnlm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-transform${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-tree${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-util${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
|
||||
- message(FATAL_ERROR "CMake build not supported on Windows")
|
||||
- # FIXME: copy files?
|
||||
- # https://cmake.org/cmake/help/latest/command/foreach.html
|
||||
- # https://stackoverflow.com/questions/34799916/copy-file-from-source-directory-to-binary-directory-using-cmake
|
||||
-endif()
|
||||
-
|
||||
-find_program(MAKE_EXE NAMES make gmake nmake)
|
||||
-
|
||||
-if(DEFINED ENV{INTEL_MKL_DIR})
|
||||
- # Default: INTEL_MKL_DIR=/opt/intel/mkl/
|
||||
- message("Compiling with MKL in: $ENV{INTEL_MKL_DIR}")
|
||||
- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=MKL --mkl-root=$ENV{INTEL_MKL_DIR})
|
||||
- set(MATHLIB_BUILD_COMMAND true)
|
||||
-else()
|
||||
- message("Compiling with OpenBLAS")
|
||||
- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=OPENBLAS)
|
||||
- set(MATHLIB_BUILD_COMMAND cd tools
|
||||
- && git clone -b v0.3.13 --single-branch https://github.com/xianyi/OpenBLAS
|
||||
- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS DYNAMIC_ARCH=1 TARGET=GENERIC USE_LOCKING=1 USE_THREAD=0 all
|
||||
- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS PREFIX=install install
|
||||
- && cd ..)
|
||||
-endif()
|
||||
-
|
||||
-if(DEFINED ENV{KALDI_BRANCH})
|
||||
- set(KALDI_BRANCH $ENV{KALDI_BRANCH})
|
||||
-else()
|
||||
- message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?")
|
||||
- # set(KALDI_BRANCH "origin/master")
|
||||
-endif()
|
||||
|
||||
message("MAKE_EXE = ${MAKE_EXE}")
|
||||
message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
|
||||
@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}")
|
||||
|
||||
# CXXFLAGS are set and exported in kaldi-configure-wrapper.sh
|
||||
|
||||
-if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
|
||||
- set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip)
|
||||
- set(STRIP_DST_COMMAND find ${DST} | xargs strip)
|
||||
- if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- list(APPEND STRIP_LIBS_COMMAND -x)
|
||||
- list(APPEND STRIP_DST_COMMAND -x)
|
||||
- endif()
|
||||
- ExternalProject_Add(kaldi
|
||||
- GIT_CONFIG advice.detachedHead=false
|
||||
- GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git
|
||||
- GIT_TAG ${KALDI_BRANCH}
|
||||
- GIT_SHALLOW TRUE
|
||||
- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/
|
||||
- BUILD_IN_SOURCE TRUE
|
||||
- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin
|
||||
- LIST_SEPARATOR " "
|
||||
- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-# Fix dynamic libraries loading paths on macOS. The libraries and
|
||||
-# executables are built with RPATH settings embedded in them, pointing
|
||||
-# to the locations in temporary directories used to build the
|
||||
-# binaries. After package installation is done, these directories are
|
||||
-# deleted and the dynamic libraries cannot be loaded. The following
|
||||
-# commands generate a shell script that fixes the paths to the dynamic
|
||||
-# libraries in the built executables and the libraries themselves.
|
||||
-# Also the commands add a custom target to invoke the generated script
|
||||
-# after the external project (kaldi) has been built. An alternative
|
||||
-# would be to change the kaldi engine build system to accept a path to
|
||||
-# where the binaries would be placed and point RPATH to that location.
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- string (REPLACE ";" " " BINARIES_STR "${BINARIES}")
|
||||
- string (REPLACE ";" " " LIBRARIES_STR "${LIBRARIES}")
|
||||
- file(GENERATE OUTPUT name_fixer
|
||||
- CONTENT
|
||||
- "for a in ${BINARIES_STR} ; do
|
||||
- a_bare=$\{a##*/\}
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare
|
||||
- for b in ${LIBRARIES_STR} ; do
|
||||
- b_bare=$\{b##*/\}
|
||||
- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare
|
||||
- done
|
||||
- done
|
||||
- for a in ${LIBRARIES_STR} ; do
|
||||
- a_bare=$\{a##*/\}
|
||||
- install_name_tool -id \"@loader_path/$a_bare\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare
|
||||
- for b in ${LIBRARIES_STR} ; do
|
||||
- b_bare=$\{b##*/\}
|
||||
- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare
|
||||
- done
|
||||
- done")
|
||||
- add_custom_target(fixer ALL COMMAND /bin/sh name_fixer)
|
||||
- add_dependencies(fixer kaldi)
|
||||
-endif()
|
||||
-
|
||||
install(CODE "MESSAGE(\"Installed kaldi engine binaries.\")")
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py
|
||||
index 0b70c7f..21e1d62 100644
|
||||
--- a/kaldi_active_grammar/utils.py
|
||||
+++ b/kaldi_active_grammar/utils.py
|
||||
@@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux'
|
||||
elif sys.platform.startswith('darwin'): platform = 'macos'
|
||||
else: raise KaldiError("unknown sys.platform")
|
||||
|
||||
-exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform)
|
||||
+exec_dir = '/'
|
||||
library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform]
|
||||
subprocess_seperator = '^&' if platform == 'windows' else ';'
|
||||
|
||||
@@ -89,13 +89,13 @@ class ExternalProcess(object):
|
||||
|
||||
shell = ush.Shell(raise_on_error=True)
|
||||
|
||||
- fstcompile = shell(os.path.join(exec_dir, 'fstcompile'))
|
||||
- fstarcsort = shell(os.path.join(exec_dir, 'fstarcsort'))
|
||||
- fstaddselfloops = shell(os.path.join(exec_dir, 'fstaddselfloops'))
|
||||
- fstinfo = shell(os.path.join(exec_dir, 'fstinfo'))
|
||||
- # compile_graph = shell(os.path.join(exec_dir, 'compile-graph'))
|
||||
- compile_graph_agf = shell(os.path.join(exec_dir, 'compile-graph-agf'))
|
||||
- # compile_graph_agf_debug = shell(os.path.join(exec_dir, 'compile-graph-agf-debug'))
|
||||
+ fstcompile = shell('fstcompile')
|
||||
+ fstarcsort = shell('fstarcsort')
|
||||
+ fstaddselfloops = shell('fstaddselfloops')
|
||||
+ fstinfo = shell('fstinfo')
|
||||
+ # compile_graph = shell('compile-graph')
|
||||
+ compile_graph_agf = shell('compile-graph-agf')
|
||||
+ # compile_graph_agf_debug = shell('compile-graph-agf-debug')
|
||||
|
||||
make_lexicon_fst = shell([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'kaldi', 'make_lexicon_fst%s.py' % ('_py2' if PY2 else ''))])
|
||||
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/kaldi_active_grammar/ffi.py b/kaldi_active_grammar/ffi.py
|
||||
index 936ed35..1eb2f3d 100644
|
||||
--- a/kaldi_active_grammar/ffi.py
|
||||
+++ b/kaldi_active_grammar/ffi.py
|
||||
@@ -15,7 +15,7 @@ from cffi import FFI
|
||||
from .utils import exec_dir, platform
|
||||
|
||||
_ffi = FFI()
|
||||
-_library_binary_path = os.path.join(exec_dir, dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform])
|
||||
+_library_binary_path = os.path.join('@kaldiFork@', dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform])
|
||||
_c_source_ignore_regex = re.compile(r'(\b(extern|DRAGONFLY_API)\b)|("C")|(//.*$)', re.MULTILINE) # Pattern for extraneous stuff to be removed
|
||||
|
||||
def encode(text):
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ededc78b8..7ee1879a5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -188,6 +188,7 @@ add_subdirectory(src/ivector)
|
||||
add_subdirectory(src/online)
|
||||
add_subdirectory(src/online2)
|
||||
add_subdirectory(src/kws)
|
||||
+add_subdirectory(src/dragonfly)
|
||||
|
||||
add_subdirectory(src/itf)
|
||||
|
||||
@@ -219,6 +220,7 @@ add_subdirectory(src/ivectorbin)
|
||||
add_subdirectory(src/onlinebin)
|
||||
add_subdirectory(src/online2bin)
|
||||
add_subdirectory(src/kwsbin)
|
||||
+add_subdirectory(src/dragonflybin)
|
||||
|
||||
# add all cuda executables
|
||||
if(CUDA_FOUND)
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/configure b/src/configure
|
||||
index 1186c6d12..4ad355e64 100755
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -1045,9 +1045,6 @@ echo "AS = $AS" >> kaldi.mk
|
||||
echo "RANLIB = $RANLIB" >> kaldi.mk
|
||||
echo >> kaldi.mk
|
||||
|
||||
-echo "Checking compiler $CXX ..."
|
||||
-check_compiler $CXX
|
||||
-
|
||||
echo "# Base configuration" >> kaldi.mk
|
||||
echo >> kaldi.mk
|
||||
if $dynamic_kaldi ; then
|
||||
@@ -1066,11 +1063,6 @@ if [ ! -f $FSTROOT/include/fst/fst.h ]; then
|
||||
failure "Could not find file $FSTROOT/include/fst/fst.h:
|
||||
you may not have installed OpenFst. See ../tools/INSTALL"
|
||||
fi
|
||||
-OPENFST_VER=${OPENFST_VER:-$(grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::')}
|
||||
-OPENFST_VER_NUM=$(echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d")
|
||||
-if [ $OPENFST_VER_NUM -lt 10600 ]; then
|
||||
- failure "OpenFst-$OPENFST_VER is not supported. You need OpenFst >= 1.6.0.)"
|
||||
-fi
|
||||
echo "OPENFSTINC = $FSTROOT/include" >> kaldi.mk
|
||||
if $static_fst ; then
|
||||
OPENFSTLIBS="$FSTROOT/lib/libfst.a"
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, scikit-build
|
||||
, cmake
|
||||
, ush
|
||||
, requests
|
||||
, numpy
|
||||
, cffi
|
||||
, openfst
|
||||
, substituteAll
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
kaldi = callPackage ./fork.nix { };
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "kaldi-active-grammar";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daanzu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY=";
|
||||
};
|
||||
|
||||
KALDI_BRANCH = "foo";
|
||||
KALDIAG_SETUP_RAW = "1";
|
||||
|
||||
patches = [
|
||||
# Makes sure scikit-build doesn't try to build the dependencies for us
|
||||
./0001-stub.patch
|
||||
# Uses the dependencies' binaries from $PATH instead of a specific directory
|
||||
./0002-exec-path.patch
|
||||
# Makes it dynamically link to the correct Kaldi library
|
||||
(substituteAll {
|
||||
src = ./0003-ffi-path.patch;
|
||||
kaldiFork = "${kaldi}/lib";
|
||||
})
|
||||
];
|
||||
|
||||
# scikit-build puts us in the wrong folder. That is bad.
|
||||
preBuild = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
buildInputs = [ openfst kaldi ];
|
||||
nativeBuildInputs = [ scikit-build cmake ];
|
||||
propagatedBuildInputs = [ ush requests numpy cffi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Kaldi speech recognition";
|
||||
homepage = "https://github.com/daanzu/kaldi-active-grammar";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
# Other platforms are supported upstream.
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, blas
|
||||
, lapack
|
||||
, openfst
|
||||
, icu
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, python3
|
||||
, openblas
|
||||
, zlib
|
||||
, gfortran
|
||||
}:
|
||||
|
||||
let
|
||||
old-openfst = openfst.overrideAttrs (self: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kkm000";
|
||||
repo = "openfst";
|
||||
rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9";
|
||||
sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx";
|
||||
};
|
||||
buildInputs = [ zlib ];
|
||||
}); in
|
||||
|
||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kaldi";
|
||||
version = "kag-v2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daanzu";
|
||||
repo = "kaldi-fork-active-grammar";
|
||||
rev = version;
|
||||
sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0004-fork-cmake.patch
|
||||
./0006-fork-configure.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
openblas
|
||||
old-openfst
|
||||
icu
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
gfortran
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"dragonfly"
|
||||
"dragonflybin"
|
||||
"bin"
|
||||
"fstbin"
|
||||
"lmbin"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Replace the shebangs for the various build scripts
|
||||
patchShebangs src
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
./configure --shared --fst-root="${old-openfst}" --use-cuda=no --openblas-root="${openblas}" --mathlib=OPENBLAS
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Fixes "patchelf: wrong ELF type"
|
||||
find . -type f -name "*.o" -print0 | xargs -0 rm -f
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp lib/* $out/lib/
|
||||
patchelf \
|
||||
--set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \
|
||||
$out/lib/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech Recognition Toolkit";
|
||||
homepage = "https://kaldi-asr.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.9.1";
|
||||
version = "2.13.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-Uzz2mWBT5BaMxYeR6YFIP1BqTWye1Hz9CTTg/bg4kSU=";
|
||||
sha256 = "sha256-v1twWyxd0nhXxvbRCbnH5TP736eeDYE5Nz62sf6HIcA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
27
pkgs/development/python-modules/ush/default.nix
Normal file
27
pkgs/development/python-modules/ush/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ush";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarruda";
|
||||
repo = "python-ush";
|
||||
rev = version;
|
||||
sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# seems to be outdated?
|
||||
"tests/test_glob.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful API for invoking with external commands";
|
||||
homepage = "https://github.com/tarruda/python-ush";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
|
@ -8,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2021.9.4";
|
||||
version = "2021.10.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -16,10 +17,11 @@ buildPythonPackage rec {
|
|||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc=";
|
||||
sha256 = "sha256-vE25b95tWxsB+uJNVpXtY5AcJZo5qsBm6Jug1ckhz7k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
backoff
|
||||
pyserial-asyncio
|
||||
];
|
||||
|
||||
|
|
@ -27,7 +29,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ " velbusaio" ];
|
||||
pythonImportsCheck = [
|
||||
"velbusaio"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to support the Velbus home automation system";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json));
|
||||
tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json));
|
||||
tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json));
|
||||
tree-sitter-make = (builtins.fromJSON (builtins.readFile ./tree-sitter-make.json));
|
||||
tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json));
|
||||
tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json));
|
||||
tree-sitter-norg = (builtins.fromJSON (builtins.readFile ./tree-sitter-norg.json));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"url": "https://github.com/alemuller/tree-sitter-make",
|
||||
"rev": "716c294283bc3dda263ccbdf55e38ec30aa0edba",
|
||||
"date": "2021-04-30T16:37:32-03:00",
|
||||
"path": "/nix/store/v2dvgqs3fxwh83dhc53xivrx8i0g519y-tree-sitter-make",
|
||||
"sha256": "1fb6rf6pc6mdawphifhlbzbgppxvq6hj48cz6073schvavgjgchc",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
|
|
@ -102,6 +102,10 @@ let
|
|||
orga = "travonted";
|
||||
repo = "tree-sitter-fennel";
|
||||
};
|
||||
"tree-sitter-make" = {
|
||||
orga = "alemuller";
|
||||
repo = "tree-sitter-make";
|
||||
};
|
||||
"tree-sitter-markdown" = {
|
||||
orga = "ikatyang";
|
||||
repo = "tree-sitter-markdown";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumneko-lua-language-server";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sumneko";
|
||||
repo = "lua-language-server";
|
||||
rev = version;
|
||||
sha256 = "sha256-PYlHjKMnqnhAJAvmHbH6Bb+qOyNzDH+ewOkXkj2u4CU=";
|
||||
sha256 = "sha256-qap6TsqaCy+9prWiUow78eBgaWGq5eUkOXBTYFnAZyo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ let pkgs = R.pipe(
|
|||
|
||||
;(async () => {
|
||||
if (!options['--no-patch']) {
|
||||
pkgs = await R.map(fixPkgAddMissingSha1, pkgs)
|
||||
pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs))
|
||||
}
|
||||
|
||||
const origJson = lockfile.parse(data)
|
||||
|
|
|
|||
|
|
@ -197,12 +197,12 @@ final: prev:
|
|||
|
||||
aurora = buildVimPluginFrom2Nix {
|
||||
pname = "aurora";
|
||||
version = "2021-09-30";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "aurora";
|
||||
rev = "25603ba44b1439a7e69637a7ee37c5dba63b5623";
|
||||
sha256 = "014pnjinm30jjh4dmxxbfnriijpa83z9g65hilmvwndqf6z7nndj";
|
||||
rev = "6ea04b2b1a01e2c00e1b126af2b43a15c2fab441";
|
||||
sha256 = "1lzv98cjqla7py5xh4qk7p89qqlfadyspj20vfblv9gsxnhl5acy";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/aurora/";
|
||||
};
|
||||
|
|
@ -233,12 +233,12 @@ final: prev:
|
|||
|
||||
auto-session = buildVimPluginFrom2Nix {
|
||||
pname = "auto-session";
|
||||
version = "2021-10-05";
|
||||
version = "2021-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rmagatti";
|
||||
repo = "auto-session";
|
||||
rev = "dc7619fc3c6e3368ae449bf8ae1ad7630a720406";
|
||||
sha256 = "0izpxbwa144r9wjiy1m0r19hfwdlm2r3pggn178gj56ll7y2njnk";
|
||||
rev = "6f9506c1a8445b902e121a630613b94c8b0cd52a";
|
||||
sha256 = "0gxf67a2l1sc5svrs6jkp6rawbjj54dvsqfr0prqindpdivxihic";
|
||||
};
|
||||
meta.homepage = "https://github.com/rmagatti/auto-session/";
|
||||
};
|
||||
|
|
@ -449,12 +449,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-10-11";
|
||||
version = "2021-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "c58af7b7f407fa8d03b1bf273b7018663e05c75c";
|
||||
sha256 = "06q2gk0s7i1akh5ijdbwinpm1psq6szndddpdn4cw1r8vhanbwkz";
|
||||
rev = "501fc90dd87ce887d391f08f84b767bff923851a";
|
||||
sha256 = "1k5wjy3fw62y3hpqzkkzhig6xk3dvc47akni6i8iwc4jr0mxjx7z";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -653,12 +653,12 @@ final: prev:
|
|||
|
||||
cmp-spell = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-spell";
|
||||
version = "2021-08-28";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "f3fora";
|
||||
repo = "cmp-spell";
|
||||
rev = "7157c9fa1029269d97d9ed5632ec575bb71981b4";
|
||||
sha256 = "1xrc3zs9jz7dvdfhfx9ikg7abxgvjns0iqr9yzn3jzqm4a37zc62";
|
||||
rev = "4ce11f44edc54f7e3087c85c1b7b388f9aece983";
|
||||
sha256 = "05akncv4w8p3h25q5dmx8h0jbn2b4l5mz9x62wj7d7qks4fjik4j";
|
||||
};
|
||||
meta.homepage = "https://github.com/f3fora/cmp-spell/";
|
||||
};
|
||||
|
|
@ -701,12 +701,12 @@ final: prev:
|
|||
|
||||
cmp_luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "cmp_luasnip";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saadparwaiz1";
|
||||
repo = "cmp_luasnip";
|
||||
rev = "7e11f27b0778b23c29ed354c1352cafdfffca6f5";
|
||||
sha256 = "06bivxfgbnrshrbs6v6ym0v0nb2i6f06f6r4kmddqqz74jaynb6g";
|
||||
rev = "9674906f4e3e4a163d4ca9b7accc1057ecf9031f";
|
||||
sha256 = "11cs9gzhx856zmsix0dsqbcz38ldizjrbhdq6wi9vzxg2da8wb56";
|
||||
};
|
||||
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
|
||||
};
|
||||
|
|
@ -737,12 +737,12 @@ final: prev:
|
|||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2021-09-12";
|
||||
version = "2021-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "2d9deb2a3b05a0c09f01edda0a4abd542cb3eebd";
|
||||
sha256 = "0y1yh5sf0irk9rr0d5vzvf58y5q5i50b9wdpbjy1b4dfvnax00gn";
|
||||
rev = "f9188b2652d7bf7131c74532e52ba25340d63b9f";
|
||||
sha256 = "093chsnh5fx4qwdw5dnn7h48fn2zlq0skwanlwm6ajws397n194k";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
|
|
@ -942,12 +942,12 @@ final: prev:
|
|||
|
||||
completion-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "completion-nvim";
|
||||
version = "2021-08-02";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "completion-nvim";
|
||||
rev = "139fb6cfbd9f7384a5489d3e4afdacb8ed977ab0";
|
||||
sha256 = "1641gx74mqbsp42m6z695l8xlr56b79vklghjdxywi35xbz4yq22";
|
||||
rev = "87b0f86da3dffef63b42845049c648b5d90f1c4d";
|
||||
sha256 = "07n5h3jbbjpciwpd6j8dnclvb70a5hwv00605cybcc5l4xvvvsga";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
|
||||
};
|
||||
|
|
@ -1206,12 +1206,12 @@ final: prev:
|
|||
|
||||
defx-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "defx.nvim";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "defx.nvim";
|
||||
rev = "c982d5129fff4dad1f1cf80cad3fdb5ec98d8bc2";
|
||||
sha256 = "0lvxivdj8l221j9mrvvb874wfavy8plln38kv5niz2wmvvwlr061";
|
||||
rev = "ed0d013bd2f7932c95dedae108b890663ce5aa30";
|
||||
sha256 = "0hm6ca1kh4rqpcy18ijisky5r17m2b5948dvfds02j3jkid5r457";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/defx.nvim/";
|
||||
};
|
||||
|
|
@ -1616,12 +1616,12 @@ final: prev:
|
|||
|
||||
edge = buildVimPluginFrom2Nix {
|
||||
pname = "edge";
|
||||
version = "2021-10-04";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "edge";
|
||||
rev = "73671fbfc70f0b78c743894b31c009b22a6ddaa3";
|
||||
sha256 = "0mbz6901l0i0cy49d63542jfvzk93d2xnbkpnih65x8whhx35vdc";
|
||||
rev = "1a91fe0efc1bb1c4564140b6a5be7e3bf5ac0873";
|
||||
sha256 = "17a9lnhwf8vsfx2pm5bwzd6khfb3w954kx1w72msfmqf46v3d1ah";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/edge/";
|
||||
};
|
||||
|
|
@ -1919,12 +1919,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2021-09-23";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "4b64ba3e4ed30e96125b5725a3475ca6fb417c6c";
|
||||
sha256 = "0i5qp89ggwknh99yxrsdb8ywffsdhr2lrigllhl4ad1lrgbfmjz7";
|
||||
rev = "59507a9773ea1a24072342da357da0708b303ef9";
|
||||
sha256 = "1d5ragvg9jxs3axln3cqj7i37c0vxdyfwl4ll06yslghb77krf6w";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -2135,12 +2135,12 @@ final: prev:
|
|||
|
||||
gitlinker-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitlinker.nvim";
|
||||
version = "2021-07-15";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruifm";
|
||||
repo = "gitlinker.nvim";
|
||||
rev = "585f2eab74cb872c421f564274ef050fa74937ab";
|
||||
sha256 = "1zc9yr7b53akn639xhczala7vqz7rdy61xnndwn37bdxzvjqm59j";
|
||||
rev = "a727080a527cb0f01843b59e9c445d7c4dce0f12";
|
||||
sha256 = "0mbnbiikavl6p0jsaal7vmxafrzdcn59xngwszx16qw8f00l76hw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
|
||||
};
|
||||
|
|
@ -2279,12 +2279,12 @@ final: prev:
|
|||
|
||||
gruvbox-material = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-material";
|
||||
version = "2021-10-04";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "gruvbox-material";
|
||||
rev = "8f95a04c0a8d4d7b84b089a11a2c41d58693d89c";
|
||||
sha256 = "1nzr0148zi89mq4yil77ns2nrs0ldnl3fh8aqxa89fivy8lg9p64";
|
||||
rev = "fa709b95ba0cbc35310125bc2e42ffeb2576bd4d";
|
||||
sha256 = "06vzhcciifb8vwzmkbwy4hnzwrj2rgz3zl91xh8dbf1g4fh54w8x";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
|
||||
};
|
||||
|
|
@ -2399,12 +2399,12 @@ final: prev:
|
|||
|
||||
hop-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hop.nvim";
|
||||
version = "2021-09-06";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaazon";
|
||||
repo = "hop.nvim";
|
||||
rev = "a3f11483e1ffd5946914db505c7b917bb6c95515";
|
||||
sha256 = "0asabmaacvfyv48rwzgcy4vy5wrp72rjmgn53ann9asfxw9ipjsh";
|
||||
rev = "2097f623b6b04f9d03e1d23c08e975e5079be64f";
|
||||
sha256 = "0d1brmiqsnq0crm5844m2sj2df7vj0ad1bkdrmyxvgnphq0z443p";
|
||||
};
|
||||
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
||||
};
|
||||
|
|
@ -2507,12 +2507,12 @@ final: prev:
|
|||
|
||||
indent-blankline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "indent-blankline.nvim";
|
||||
version = "2021-10-06";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "indent-blankline.nvim";
|
||||
rev = "948b6ac3303b9e2e75daad0bd0ec844ed6b06d4a";
|
||||
sha256 = "1adsy4nkl8dm6bqkc2chy47na3kqh8g1lkmxzvc5wdfw0c27z0i0";
|
||||
rev = "0a98fa8dacafe22df0c44658f9de3968dc284d20";
|
||||
sha256 = "1mwj3wsp6b1m6amii5pz2b0nbs6ac8w0285wg8gd3g2y3ywihi2g";
|
||||
};
|
||||
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
|
||||
};
|
||||
|
|
@ -2700,12 +2700,12 @@ final: prev:
|
|||
|
||||
kommentary = buildVimPluginFrom2Nix {
|
||||
pname = "kommentary";
|
||||
version = "2021-08-26";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b3nj5m1n";
|
||||
repo = "kommentary";
|
||||
rev = "09d332c66b7155b14eb22c9129aee44d9d2ff496";
|
||||
sha256 = "1cdzsqilnb90wqicjb9v58wiayp8a7wa44q4aw7a5a74yyxysfhy";
|
||||
rev = "8f1cd74ad28de7d7c4fda5d8e8557ff240904b42";
|
||||
sha256 = "0avd7v0nzz31nf5vj29npw5g7c2rrlirvkyd042qlh5y2vas7b2g";
|
||||
};
|
||||
meta.homepage = "https://github.com/b3nj5m1n/kommentary/";
|
||||
};
|
||||
|
|
@ -3048,12 +3048,12 @@ final: prev:
|
|||
|
||||
lspkind-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lspkind-nvim";
|
||||
version = "2021-10-07";
|
||||
version = "2021-10-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsails";
|
||||
repo = "lspkind-nvim";
|
||||
rev = "521e4f9217d9bcc388daf184be8b168233e8aeed";
|
||||
sha256 = "06g57xwsfz9bs0d7maaba6g09ilcmmmhcamv11jh4b3qn2vqx95s";
|
||||
rev = "0f7851772ebdd5cb67a04b3d3cda5281a1eb83c1";
|
||||
sha256 = "0jk1xlp8x6vw40dl96zvmdxv0p8100rzx7za58xpahz10232lckx";
|
||||
};
|
||||
meta.homepage = "https://github.com/onsails/lspkind-nvim/";
|
||||
};
|
||||
|
|
@ -3096,12 +3096,12 @@ final: prev:
|
|||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "111e7966d746d9f1e9d0e159d37d6aa2bbda8712";
|
||||
sha256 = "1n1iz6sb6bx69cxyhsrhy6m0771f2ags52rs7x20737nqij4l1vq";
|
||||
rev = "4526e71635b2d238c0f76f058e8c4de3a6b5bd51";
|
||||
sha256 = "08xrppvjzc6hnzfkjy1y7k4n5pxgamrzchv9nry6yzi9w3ijnhyb";
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
};
|
||||
|
|
@ -3192,12 +3192,12 @@ final: prev:
|
|||
|
||||
minimap-vim = buildVimPluginFrom2Nix {
|
||||
pname = "minimap.vim";
|
||||
version = "2021-08-27";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "minimap.vim";
|
||||
rev = "45a8eabefd500ab4496ee790d3ac178eb4de9fb9";
|
||||
sha256 = "13mlcjkdbhpfgcg45m7whylxsaylgx1lysr5npc7gk6a85l2slzq";
|
||||
rev = "723c5fc3a4d0e772bb2864913196435cf910bbc5";
|
||||
sha256 = "1zbm77zkfg006z00mzcv136rqgyfzv7qy4dskcay1sfcr0q8yx1s";
|
||||
};
|
||||
meta.homepage = "https://github.com/wfxr/minimap.vim/";
|
||||
};
|
||||
|
|
@ -3528,12 +3528,12 @@ final: prev:
|
|||
|
||||
neogit = buildVimPluginFrom2Nix {
|
||||
pname = "neogit";
|
||||
version = "2021-10-08";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimUntersberger";
|
||||
repo = "neogit";
|
||||
rev = "ab2840c8c1a8df92cd37a086948d0528ffdede32";
|
||||
sha256 = "0iz85svvq0h38nbkih0spgnlh0gnnhk2y3rs7igc5gjka7k7mc89";
|
||||
rev = "727652348bf4f39a354e88d1b2cbf36220d109db";
|
||||
sha256 = "07skmgl78vqks21lr64sm808zqbqf2013rf7ph9rkfz5wrn4zcvd";
|
||||
};
|
||||
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
||||
};
|
||||
|
|
@ -3660,12 +3660,12 @@ final: prev:
|
|||
|
||||
neovim-ayu = buildVimPluginFrom2Nix {
|
||||
pname = "neovim-ayu";
|
||||
version = "2021-10-05";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shatur";
|
||||
repo = "neovim-ayu";
|
||||
rev = "750d2246d38cd2839356ab8506fc8328a76d33db";
|
||||
sha256 = "0gg11pswi2alz2khd7ygjhq6kb2nnawpd1f2vvgpc3wpqhp6lk92";
|
||||
rev = "baf9ac7f20dbc225644ab4825f007bc65e944dce";
|
||||
sha256 = "0x0y78kps2p9skqykcrvlgbhmmm5x5c5kkwz1dfc0akzkdjy8505";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
|
||||
};
|
||||
|
|
@ -3816,12 +3816,12 @@ final: prev:
|
|||
|
||||
nnn-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nnn.vim";
|
||||
version = "2021-09-30";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcchrish";
|
||||
repo = "nnn.vim";
|
||||
rev = "892ca98fa8ecedb4f14988451a5cf539250c8b86";
|
||||
sha256 = "192lfhgzci09n1j56nj80nj12a3qx7r6qj21vnvqai0xh59dgy42";
|
||||
rev = "f7ebbaa41da15a964758f009e8e05463974a0aee";
|
||||
sha256 = "1spma6n0vyavllawd98zccwmkscisq69547qqxqgfz9j69dllrfg";
|
||||
};
|
||||
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
|
||||
};
|
||||
|
|
@ -3876,12 +3876,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "01bb7be2a576003b4f7d23aa3561c5cc65c6b47b";
|
||||
sha256 = "1ygr5641jzlr0b835aicfd5f5lq8fvh7iby74v2wf9684zn75sv0";
|
||||
rev = "bd0f8daa3c70d099857e9223f33eec9511b6047c";
|
||||
sha256 = "039b475k33pmb9lchbfnr4l0fkghnjr4kyhni4ndznj81ln190fi";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -3924,12 +3924,12 @@ final: prev:
|
|||
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-10-11";
|
||||
version = "2021-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "b5d077d2a055485a00846a107c777321feed1d29";
|
||||
sha256 = "0ivl7286nni8pvidzgxsklc4x2v6gyx90brvdpg6j18n2xg8i380";
|
||||
rev = "db48f0b4837be2bf40ad55860baa686c0e013ac4";
|
||||
sha256 = "1ikbamwl7cdihmlg2vnl838mq58z0lqcynn3x5p39wq11dql89lb";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||
};
|
||||
|
|
@ -3984,12 +3984,12 @@ final: prev:
|
|||
|
||||
nvim-cmp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cmp";
|
||||
version = "2021-10-11";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "fe2b245ea124427a22f6008c45aa43eec37b2661";
|
||||
sha256 = "12ggywkgg9a6nccjah5lj31h43f3p5j22dn50agiis814a8syr8k";
|
||||
rev = "f5393d5bd934428a469f03f5bc225922f8c48367";
|
||||
sha256 = "0gss8d5anf94iic60wwnnc8d5msdx17yydb84fbk21h2a9gv8g8b";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
|
|
@ -4116,12 +4116,12 @@ final: prev:
|
|||
|
||||
nvim-gps = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gps";
|
||||
version = "2021-10-06";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smiteshp";
|
||||
repo = "nvim-gps";
|
||||
rev = "449dc8b5b34d54504d8331b9fa7eee95520400cc";
|
||||
sha256 = "1baa9l71dgn2chbkj6p00rkj8xdq6d8icr93w31wmas6470bwgf2";
|
||||
rev = "5576661c8ddd3c881b5f97446b919090033ce74f";
|
||||
sha256 = "1zvbiys1wgyc5figabw9p8dvz3jj756wgjdjg7k44cfn5c0vld42";
|
||||
};
|
||||
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
|
||||
};
|
||||
|
|
@ -4176,24 +4176,24 @@ final: prev:
|
|||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2021-10-04";
|
||||
version = "2021-10-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "fb7fa4adf6c6464784e248b3a12e6ca0b3f4855a";
|
||||
sha256 = "1p7i1vq6w9ghp9xhv78rbjj9c5sp01b3qqyhskqdzn1pkgj4pwr8";
|
||||
rev = "3c5d42a433fcb73fa9a2e07647ef02288479b284";
|
||||
sha256 = "19s8yczi1vyl8arxmqkiq34y1hmx4ws1d0qrsk6y7jk7dskxyqc5";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "e609a702eaf2d6bfb1e0fe8c44a5bf84436fb5a6";
|
||||
sha256 = "113p3nmnm5fj0ckd3b7zqcxq1nnjc9a7178x0dzjf614vll449yq";
|
||||
rev = "e4bed57f127310764f08e8b45f1ed3a31c6094e0";
|
||||
sha256 = "02m8p0pdmvgm0mk9b5h5smj91fy43gsrp742yn3a49njbm252n8q";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -4224,12 +4224,12 @@ final: prev:
|
|||
|
||||
nvim-notify = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-notify";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-notify";
|
||||
rev = "f3eb97c099ddf14b16710a6f17a68d2baf82927f";
|
||||
sha256 = "1las5x4nqabf0zivw3bv2912748n97ndqv9k561x9l0d8q18r5yv";
|
||||
rev = "4743b32755ff3cb2e03fd4a0a6413bb7ea9e2617";
|
||||
sha256 = "06v0swwlk22n0x26bgw1krf26vr7khkc2yjdi4y13saj47c46z4p";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
|
||||
};
|
||||
|
|
@ -4296,12 +4296,12 @@ final: prev:
|
|||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "fda5b82bdf5def17758282978128efaa2d3b243a";
|
||||
sha256 = "1v89447yygg8qn30hdcrc3v14xrbvk2m3z228ryik0xm6gyr2im8";
|
||||
rev = "7f5a49f7c4699bb57635a36869f5149af491e761";
|
||||
sha256 = "0yf40ypkvjn1g9brfhhfykhpjqg0x55h8ipxg0mdkmn24gp6n7xb";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||
};
|
||||
|
|
@ -4380,12 +4380,12 @@ final: prev:
|
|||
|
||||
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow";
|
||||
version = "2021-10-03";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "nvim-ts-rainbow";
|
||||
rev = "9cac1e40e396110ffb2cf04622ea7a7725436dae";
|
||||
sha256 = "0s34808s7nkqfz0pznzm517x4rsjy9dc3y2brmxk8gp4vfj7jz13";
|
||||
rev = "0943a858aeaef4f06e14a268c276767b3a7da930";
|
||||
sha256 = "16l0l88rr2q233xv4jiwj8w8i0d6ql9cn15fbpksf8d1djr2wxia";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
||||
};
|
||||
|
|
@ -4488,12 +4488,12 @@ final: prev:
|
|||
|
||||
onedark-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedark.nvim";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedark.nvim";
|
||||
rev = "20cb34e8b411f500e52100b58579fe0f401cd4ae";
|
||||
sha256 = "11b02l24nv26qz3da969vxlj2dni2y2csbk8vivm0di62gjnd044";
|
||||
rev = "0221cbbd66697d235a7addde172585f0a295cd91";
|
||||
sha256 = "06vh7abdzh25151svjsaawh8x0lp1qxc56c11dr9jfgnz1fq4gnv";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedark.nvim/";
|
||||
};
|
||||
|
|
@ -4945,12 +4945,12 @@ final: prev:
|
|||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2021-10-07";
|
||||
version = "2021-10-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "b3e8deb0eecece54c3bbe2437343b8884f47fd9f";
|
||||
sha256 = "17a8jmdskp0gx9nk3n5qfb0myqhiz35cmjcf080qrfhy304ddglr";
|
||||
rev = "3990e5b3609bd883fdc432082f5e1c467ae7d615";
|
||||
sha256 = "0hh4wysfm1p8kkh6ji27vmvxvg2nm7fnkicaby6y88v0zf5scham";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
|
|
@ -5053,12 +5053,12 @@ final: prev:
|
|||
|
||||
rust-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "rust-tools.nvim";
|
||||
version = "2021-10-06";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "rust-tools.nvim";
|
||||
rev = "4a9c749bee7956cd54322ed04749bb7be329eddd";
|
||||
sha256 = "0508kanxnbgd6i3mfsf3rcg5glxjpgm3nidbsj5lgcv1w6nxf45g";
|
||||
rev = "21b19674b85178dd7d44751985b8de8389e9eb75";
|
||||
sha256 = "06gn4slv9z4jn6l3q31dl8l4j33l5mmn8rx5ddk966dfiq8yvpjw";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||
};
|
||||
|
|
@ -5306,12 +5306,12 @@ final: prev:
|
|||
|
||||
sonokai = buildVimPluginFrom2Nix {
|
||||
pname = "sonokai";
|
||||
version = "2021-10-04";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "sonokai";
|
||||
rev = "81e19fc3db1af37ec5acf2d7cb11b97ae48c34b6";
|
||||
sha256 = "1g67hpnk366z71an7kl0g8x0ikn9v4yiaqv87b5n6s2ax6h3z9lr";
|
||||
rev = "995c6d30ac2846c8230488246057c1ad1aa0b908";
|
||||
sha256 = "0vbw5sbm1ldqb38g5if1p1wn41n1vra6lnqc1crz4vl3wiqra6v5";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/sonokai/";
|
||||
};
|
||||
|
|
@ -5704,12 +5704,12 @@ final: prev:
|
|||
|
||||
telescope-coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-coc.nvim";
|
||||
version = "2021-10-08";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "telescope-coc.nvim";
|
||||
rev = "2001656a0b5d6e2487c16839c431750b4316dbd9";
|
||||
sha256 = "0hx0sn2qrvqzcggjgvz2aa0pz0fwv3lzapwn06ac71ccqhlqnjj3";
|
||||
rev = "fc72e26b7a47e99e8ccdc21d76fd2ebc18fd34e2";
|
||||
sha256 = "0f41f85m8s8smbqin9cflzkvd9cyknjps8hix566cfvx3qsx0ib7";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
|
||||
};
|
||||
|
|
@ -5813,12 +5813,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope.nvim";
|
||||
version = "2021-10-09";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "ba41f0eeb13796c26f6c5f3e8c44b2397a466e39";
|
||||
sha256 = "1r33m518s8mcm4iwma2vj03ghqx27qpkyzn843zfwkawa4xdv9vh";
|
||||
rev = "b5c63c6329cff8dd8e23047eecd1f581379f1587";
|
||||
sha256 = "16xd50ihmdlsbjidykqc53zk98vc0yfpj7rkmyha2jkvanxy53yh";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -6030,12 +6030,12 @@ final: prev:
|
|||
|
||||
TrueZen-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "TrueZen.nvim";
|
||||
version = "2021-09-11";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pocco81";
|
||||
repo = "TrueZen.nvim";
|
||||
rev = "5dfd2c23ce269a7b70708d84f3ce44bfc10d7830";
|
||||
sha256 = "100gncjw94di6j9f9wl266s5cp2lywp18gzwzq4mzvp9y4kk7baf";
|
||||
rev = "508b977d71650da5c9243698614a9a1416f116d4";
|
||||
sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx";
|
||||
};
|
||||
meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/";
|
||||
};
|
||||
|
|
@ -7530,12 +7530,12 @@ final: prev:
|
|||
|
||||
vim-flog = buildVimPluginFrom2Nix {
|
||||
pname = "vim-flog";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbong";
|
||||
repo = "vim-flog";
|
||||
rev = "b644ab70385d65368097ab952fbfe309ed789daa";
|
||||
sha256 = "15yj3hx2yhgxw8634daal63l7j45c57jjinr21d01m3pbck9cmqd";
|
||||
rev = "6b3d37338c1f1da03bab16e4614507ab273e3305";
|
||||
sha256 = "1bmafcyzg5vhwfphacgm5f2hpcs52ickl3zf56394jdll8gxbn2c";
|
||||
};
|
||||
meta.homepage = "https://github.com/rbong/vim-flog/";
|
||||
};
|
||||
|
|
@ -7590,12 +7590,12 @@ final: prev:
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "69f5fcbd459c113181d18a0ea2641cd47c9e0318";
|
||||
sha256 = "06g5zc09mw9bpz6aga7ikilirzgzvbawf4p3ss9gkgxpc9fzxwy1";
|
||||
rev = "2e66b3ad05d85f09d870f82671b8503cf8fa4297";
|
||||
sha256 = "0145yrr3cjgzfm9arrs3wqwg3wlban3rpgb5jiwaiavrk2grlwkz";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
@ -8035,12 +8035,12 @@ final: prev:
|
|||
|
||||
vim-indent-guides = buildVimPluginFrom2Nix {
|
||||
pname = "vim-indent-guides";
|
||||
version = "2018-05-14";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nathanaelkane";
|
||||
repo = "vim-indent-guides";
|
||||
rev = "54d889a63716ee2f1818aa2ec5082db47147147b";
|
||||
sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2";
|
||||
rev = "765084d38bf102a95ab966fb06472e83fa7deff7";
|
||||
sha256 = "0gffchphg5chg3311x0mb8xd4ir8psdmdscqpx37bxz5w9n7qsdp";
|
||||
};
|
||||
meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/";
|
||||
};
|
||||
|
|
@ -9201,12 +9201,12 @@ final: prev:
|
|||
|
||||
vim-ps1 = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ps1";
|
||||
version = "2020-11-25";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PProvost";
|
||||
repo = "vim-ps1";
|
||||
rev = "26a75886caef937bfad4201d5478571a992984c2";
|
||||
sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl";
|
||||
rev = "d0b89c2dc0f6af09d7876963e94e5c7567eacac6";
|
||||
sha256 = "1m8kjnj3xz5vmzs0ycbwm700jczmhgf2y1sfjx178b0jachfyq0j";
|
||||
};
|
||||
meta.homepage = "https://github.com/PProvost/vim-ps1/";
|
||||
};
|
||||
|
|
@ -9837,12 +9837,12 @@ final: prev:
|
|||
|
||||
vim-surround = buildVimPluginFrom2Nix {
|
||||
pname = "vim-surround";
|
||||
version = "2019-11-28";
|
||||
version = "2021-10-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-surround";
|
||||
rev = "f51a26d3710629d031806305b6c8727189cd1935";
|
||||
sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr";
|
||||
rev = "aeb933272e72617f7c4d35e1f003be16836b948d";
|
||||
sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-surround/";
|
||||
};
|
||||
|
|
@ -10607,12 +10607,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-10-11";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "dae6e5c8e07dd2a769b399d9ace53bab867e6048";
|
||||
sha256 = "16jvhf1dg6vxb5w622gn91qd4bll6p06rsf561ijdcp9w1132d4m";
|
||||
rev = "4b3ceb9eb7f0e12c239d7ef4262728491aee89ba";
|
||||
sha256 = "1q3ygk39pbm2bhq463c0rc7zqm5zzg2ln2k1qka1v2i4ghngaszi";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
@ -10727,12 +10727,12 @@ final: prev:
|
|||
|
||||
wilder-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "wilder.nvim";
|
||||
version = "2021-10-10";
|
||||
version = "2021-10-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gelguy";
|
||||
repo = "wilder.nvim";
|
||||
rev = "615df90caac067673c34f0fb8b399b164ef6449a";
|
||||
sha256 = "0y787bm302wrpk187gcr49qw5x28gjzxajjl2dh16acvf5hdzj3w";
|
||||
rev = "52ff550ef05a0110f4decc4629e0a58b94ca97b8";
|
||||
sha256 = "1xwn6jcgf1wbyzsm64n51m82xpy8s6k7yhyvd7c8byp2gbh7z0r8";
|
||||
};
|
||||
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
|
||||
};
|
||||
|
|
@ -10848,12 +10848,12 @@ final: prev:
|
|||
|
||||
YouCompleteMe = buildVimPluginFrom2Nix {
|
||||
pname = "YouCompleteMe";
|
||||
version = "2021-09-19";
|
||||
version = "2021-10-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ycm-core";
|
||||
repo = "YouCompleteMe";
|
||||
rev = "4117a99861b537830d717c3113e3d584523bc573";
|
||||
sha256 = "1c0p1zk54rcn4ph1h17qyfrsdx90rgw7cc9hp1n8xpb9nhwvx494";
|
||||
rev = "347bbf73d980501c4e1705879bcfe49ea0375af1";
|
||||
sha256 = "1ywj63kn0i6c8wr7y09vydb9cic2cqpkq5n40xwb0gbqk8n89z2k";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
|
||||
|
|
@ -10909,12 +10909,12 @@ final: prev:
|
|||
|
||||
zig-vim = buildVimPluginFrom2Nix {
|
||||
pname = "zig.vim";
|
||||
version = "2021-09-29";
|
||||
version = "2021-10-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "e77b52c561eef4e3489dde560efce6def68c35d0";
|
||||
sha256 = "0793bb45zmdrcg2xnpy1yfn5ajmi9apca30rxsw5b2yr9mp142wd";
|
||||
rev = "0adf3a1407bdf60a6c1446fb6a9a05c9823e4290";
|
||||
sha256 = "0sdjznbzwj180g1jgn6rizbq2dq2clpcj1rj1xb3m127w4rgqhyj";
|
||||
};
|
||||
meta.homepage = "https://github.com/ziglang/zig.vim/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ let
|
|||
# Dependencies that are required to build kernel modules
|
||||
moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf;
|
||||
|
||||
|
||||
installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
|
||||
#!${stdenv.shell} -e
|
||||
mkdir -p $4
|
||||
|
|
@ -88,6 +89,8 @@ let
|
|||
|
||||
isModular = config.isYes "MODULES";
|
||||
|
||||
buildDTBs = kernelConf.DTB or false;
|
||||
|
||||
installsFirmware = (config.isEnabled "FW_LOADER") &&
|
||||
(isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
|
||||
(lib.versionOlder version "4.14");
|
||||
|
|
@ -175,15 +178,16 @@ let
|
|||
"KBUILD_BUILD_VERSION=1-NixOS"
|
||||
kernelConf.target
|
||||
"vmlinux" # for "perf" and things like that
|
||||
]
|
||||
++ optional isModular "modules"
|
||||
] ++ optional isModular "modules"
|
||||
++ optional buildDTBs "dtbs"
|
||||
++ extraMakeFlags;
|
||||
|
||||
installFlags = [
|
||||
"INSTALLKERNEL=${installkernel}"
|
||||
"INSTALL_PATH=$(out)"
|
||||
] ++ (optional isModular "INSTALL_MOD_PATH=$(out)")
|
||||
++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";
|
||||
++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"
|
||||
++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"];
|
||||
|
||||
preInstall = ''
|
||||
installFlagsArray+=("-j$NIX_BUILD_CORES")
|
||||
|
|
@ -199,9 +203,7 @@ let
|
|||
|
||||
postInstall = (optionalString installsFirmware ''
|
||||
mkdir -p $out/lib/firmware
|
||||
'') + (if (kernelConf.DTB or false) then ''
|
||||
make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs
|
||||
'' else "") + (if isModular then ''
|
||||
'') + (if isModular then ''
|
||||
mkdir -p $dev
|
||||
cp vmlinux $dev/
|
||||
if [ -z "''${dontStrip-}" ]; then
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ buildGoModule rec {
|
|||
description = "A free, open source game management panel";
|
||||
homepage = "https://www.pufferpanel.com/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ ronthecookie ];
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E=";
|
||||
sha256 = "155rn0balgikkhy77gbva6a88pgwm27flzgjyphiwzwnah1mmhca";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8=";
|
||||
cargoSha256 = "1pk56s47mk0f8cww6h1y43jdnf311g35xynz1jvhrk31yyjhb0jl";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libiconv
|
||||
, rustPlatform
|
||||
|
|
@ -7,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkolaczk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE=";
|
||||
sha256 = "sha256-7rwiqjjXB1+R+/kauGjiJOX/UtMmQW3U3xGL/rsSiQ0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw=";
|
||||
cargoSha256 = "sha256-g4z+05jiVaH3KCPVwJmvQbi0OCYtuafyZyVZDRRyPRA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds.";
|
||||
homepage = "https://github.com/anko/zthrottle";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.ronthecookie ];
|
||||
maintainers = [ maintainers.ckie ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -539,9 +539,10 @@ mapAliases ({
|
|||
mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
|
||||
minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
||||
minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
||||
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14
|
||||
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mysql-client = hiPrio mariadb.client;
|
||||
memtest86 = memtest86plus; # added 2019-05-08
|
||||
mesa_noglu = mesa; # added 2019-05-28
|
||||
|
|
|
|||
|
|
@ -6279,6 +6279,8 @@ with pkgs;
|
|||
|
||||
imgurbash2 = callPackage ../tools/graphics/imgurbash2 { };
|
||||
|
||||
in-formant = callPackage ../applications/audio/in-formant { };
|
||||
|
||||
inadyn = callPackage ../tools/networking/inadyn { };
|
||||
|
||||
incron = callPackage ../tools/system/incron { };
|
||||
|
|
@ -7404,8 +7406,6 @@ with pkgs;
|
|||
|
||||
mimetic = callPackage ../development/libraries/mimetic { };
|
||||
|
||||
minetime = callPackage ../applications/office/minetime { };
|
||||
|
||||
minio-client = callPackage ../tools/networking/minio-client { };
|
||||
|
||||
minio-certgen = callPackage ../tools/security/minio-certgen { };
|
||||
|
|
@ -11281,6 +11281,8 @@ with pkgs;
|
|||
})
|
||||
crystal_0_36
|
||||
crystal_1_0
|
||||
crystal_1_1
|
||||
crystal_1_2
|
||||
crystal;
|
||||
|
||||
crystal2nix = callPackage ../development/compilers/crystal2nix { };
|
||||
|
|
@ -24007,9 +24009,7 @@ with pkgs;
|
|||
|
||||
csa = callPackage ../applications/audio/csa { };
|
||||
|
||||
csound = callPackage ../applications/audio/csound {
|
||||
fluidsynth = fluidsynth_1;
|
||||
};
|
||||
csound = callPackage ../applications/audio/csound { };
|
||||
|
||||
csound-manual = callPackage ../applications/audio/csound/csound-manual {
|
||||
python = python27;
|
||||
|
|
|
|||
|
|
@ -2261,6 +2261,8 @@ in {
|
|||
|
||||
dpkt = callPackage ../development/python-modules/dpkt { };
|
||||
|
||||
dragonfly = callPackage ../development/python-modules/dragonfly { };
|
||||
|
||||
drf-jwt = callPackage ../development/python-modules/drf-jwt { };
|
||||
|
||||
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
|
||||
|
|
@ -4013,6 +4015,8 @@ in {
|
|||
|
||||
Kajiki = callPackage ../development/python-modules/kajiki { };
|
||||
|
||||
kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { };
|
||||
|
||||
kaptan = callPackage ../development/python-modules/kaptan { };
|
||||
|
||||
karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { };
|
||||
|
|
@ -9476,6 +9480,8 @@ in {
|
|||
|
||||
userpath = callPackage ../development/python-modules/userpath { };
|
||||
|
||||
ush = callPackage ../development/python-modules/ush { };
|
||||
|
||||
utils = callPackage ../development/python-modules/utils { };
|
||||
|
||||
uuid = callPackage ../development/python-modules/uuid { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue