Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c26bb8fca8
|
|
@ -4460,6 +4460,12 @@
|
|||
githubId = 424946;
|
||||
name = "James Earl Douglas";
|
||||
};
|
||||
earthengine = {
|
||||
email = "earthengine@skiff.com";
|
||||
github = "ee2500";
|
||||
githubId = 134107129;
|
||||
name = "EarthEngine";
|
||||
};
|
||||
ebbertd = {
|
||||
email = "daniel@ebbert.nrw";
|
||||
github = "ebbertd";
|
||||
|
|
@ -5685,6 +5691,16 @@
|
|||
fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9";
|
||||
}];
|
||||
};
|
||||
gaelreyrol = {
|
||||
email = "me@gaelreyrol.dev";
|
||||
matrix = "@Zevran:matrix.org";
|
||||
name = "Gaël Reyrol";
|
||||
github = "gaelreyrol";
|
||||
githubId = 498465;
|
||||
keys = [{
|
||||
fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61";
|
||||
}];
|
||||
};
|
||||
GaetanLepage = {
|
||||
email = "gaetan@glepage.com";
|
||||
github = "GaetanLepage";
|
||||
|
|
@ -10471,6 +10487,11 @@
|
|||
githubId = 9469313;
|
||||
name = "Gregoire Martinache";
|
||||
};
|
||||
mgregson = {
|
||||
github = "mgregson";
|
||||
githubId = 333572;
|
||||
name = "Michael Gregson";
|
||||
};
|
||||
mgttlinger = {
|
||||
email = "megoettlinger@gmail.com";
|
||||
github = "mgttlinger";
|
||||
|
|
|
|||
|
|
@ -94,38 +94,110 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.agent.enable {
|
||||
environment.etc."gnupg/gpg-agent.conf".text = ''
|
||||
pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
|
||||
'';
|
||||
|
||||
# This overrides the systemd user unit shipped with the gnupg package
|
||||
systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
|
||||
serviceConfig.ExecStart = [ "" ''
|
||||
${cfg.package}/bin/gpg-agent --supervised \
|
||||
--pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
|
||||
'' ];
|
||||
unitConfig = {
|
||||
Description = "GnuPG cryptographic agent and passphrase cache";
|
||||
Documentation = "man:gpg-agent(1)";
|
||||
Requires = [ "gpg-agent.socket" ];
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/gpg-agent --supervised";
|
||||
ExecReload = "${cfg.package}/bin/gpgconf --reload gpg-agent";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.sockets.gpg-agent = {
|
||||
unitConfig = {
|
||||
Description = "GnuPG cryptographic agent and passphrase cache";
|
||||
Documentation = "man:gpg-agent(1)";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/gnupg/S.gpg-agent";
|
||||
FileDescriptorName = "std";
|
||||
SocketMode = "0600";
|
||||
DirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport {
|
||||
unitConfig = {
|
||||
Description = "GnuPG cryptographic agent (ssh-agent emulation)";
|
||||
Documentation = "man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/gnupg/S.gpg-agent.ssh";
|
||||
FileDescriptorName = "ssh";
|
||||
Service = "gpg-agent.service";
|
||||
SocketMode = "0600";
|
||||
DirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket {
|
||||
unitConfig = {
|
||||
Description = "GnuPG cryptographic agent and passphrase cache (restricted)";
|
||||
Documentation = "man:gpg-agent(1)";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/gnupg/S.gpg-agent.extra";
|
||||
FileDescriptorName = "extra";
|
||||
Service = "gpg-agent.service";
|
||||
SocketMode = "0600";
|
||||
DirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket {
|
||||
unitConfig = {
|
||||
Description = "GnuPG cryptographic agent and passphrase cache (access for web browsers)";
|
||||
Documentation = "man:gpg-agent(1)";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/gnupg/S.gpg-agent.browser";
|
||||
FileDescriptorName = "browser";
|
||||
Service = "gpg-agent.service";
|
||||
SocketMode = "0600";
|
||||
DirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
systemd.user.services.dirmngr = mkIf cfg.dirmngr.enable {
|
||||
unitConfig = {
|
||||
Description = "GnuPG network certificate management daemon";
|
||||
Documentation = "man:dirmngr(8)";
|
||||
Requires = "dirmngr.socket";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/dirmngr --supervised";
|
||||
ExecReload = "${cfg.package}/bin/gpgconf --reload dirmngr";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable {
|
||||
unitConfig = {
|
||||
Description = "GnuPG network certificate management daemon";
|
||||
Documentation = "man:dirmngr(8)";
|
||||
};
|
||||
socketConfig = {
|
||||
ListenStream = "%t/gnupg/S.dirmngr";
|
||||
SocketMode = "0600";
|
||||
DirectoryMode = "0700";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
services.dbus.packages = mkIf (cfg.agent.pinentryFlavor == "gnome3") [ pkgs.gcr ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
environment.interactiveShellInit = ''
|
||||
# Bind gpg-agent to this TTY if gpg commands are used.
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
if [[ "$USER" != ${user} ]]; then
|
||||
sudo='exec /run/wrappers/bin/sudo -u ${user}'
|
||||
fi
|
||||
$sudo ${cfg.phpPackage}/bin/php artisan "$@"
|
||||
$sudo ${phpPackage}/bin/php artisan "$@"
|
||||
'';
|
||||
dbSocket = {
|
||||
"pgsql" = "/run/postgresql";
|
||||
|
|
|
|||
|
|
@ -670,6 +670,7 @@ in {
|
|||
samba = handleTest ./samba.nix {};
|
||||
samba-wsdd = handleTest ./samba-wsdd.nix {};
|
||||
sanoid = handleTest ./sanoid.nix {};
|
||||
scaphandre = handleTest ./scaphandre.nix {};
|
||||
schleuder = handleTest ./schleuder.nix {};
|
||||
sddm = handleTest ./sddm.nix {};
|
||||
seafile = handleTest ./seafile.nix {};
|
||||
|
|
|
|||
18
nixos/tests/scaphandre.nix
Normal file
18
nixos/tests/scaphandre.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
import ./make-test-python.nix {
|
||||
name = "scaphandre";
|
||||
|
||||
nodes = {
|
||||
scaphandre = { pkgs, ... } : {
|
||||
boot.kernelModules = [ "intel_rapl_common" ];
|
||||
|
||||
environment.systemPackages = [ pkgs.scaphandre ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... } : ''
|
||||
scaphandre.start()
|
||||
scaphandre.wait_until_succeeds(
|
||||
"scaphandre stdout -t 4",
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
pname = "qjackctl";
|
||||
|
||||
# some dependencies such as killall have to be installed additionally
|
||||
|
|
@ -14,7 +14,7 @@ mkDerivation rec {
|
|||
owner = "rncbc";
|
||||
repo = "qjackctl";
|
||||
rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-XF5v+VgSCqqV2ft9qw1NTNzeYOv1OuhljJGdgikPLEo=";
|
||||
sha256 = "sha256-dZW9bZ17O/1DxBr5faYSE+YkSuz7NIJSc1vqxzOOxyg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "sha256-ZdEbGsGt1Z/vve3W/Z6Pw1+m5xoTY/l7Es03yM4T0tE=";
|
||||
sha256 = "sha256-YGSHEvanWek6qiWvKs6g+HneGbuuqJn/DBfhawjQi5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "btcd";
|
||||
version = "0.23.3";
|
||||
version = "0.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btcsuite";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LdK68Ianiyrs+HVMwrkiX2ruCWKkdpuY8ylxhNbm9qI=";
|
||||
hash = "sha256-X1kfr6jrVArm0HK0XiN/93OPxqPo8J4U+qglJAf23+A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY=";
|
||||
vendorHash = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY=";
|
||||
|
||||
subPackages = [ "." "cmd/*" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -173,12 +173,12 @@ final: prev:
|
|||
|
||||
LazyVim = buildVimPluginFrom2Nix {
|
||||
pname = "LazyVim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "47111bd2db140aac32422752e07db7a1c5b74659";
|
||||
sha256 = "1c10kj7f3512j62nwhnlqxf8y4frx24k0j1vvyw226rv7cla0vyq";
|
||||
rev = "c3477ed81e8e26bce1eb53f9c04a8aa7adc1807a";
|
||||
sha256 = "1hga1b9zx8ygrpr7863x12pd3rh9c3k69lgg59jzpzxiasnm3wkj";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
|
|
@ -305,12 +305,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "4f96b7bb1a0d5973a249e654f02adf2973422dcc";
|
||||
sha256 = "0nc5sbdkhahyf80ng9g3gysp385m347lw2djr46fwcmkmlypllg2";
|
||||
rev = "7322390c9abff6f137774d9e04bddb3cd725afd1";
|
||||
sha256 = "1r9kqnhr3b14fs929xbh6qfrxmki961svlj2208vmlfmbsp7sx13";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
|
@ -353,24 +353,24 @@ final: prev:
|
|||
|
||||
SpaceCamp = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceCamp";
|
||||
version = "2023-01-31";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaredgorski";
|
||||
repo = "SpaceCamp";
|
||||
rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1";
|
||||
sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g";
|
||||
rev = "3e37187e1e5731d7d36980db3f92e7332406813a";
|
||||
sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z";
|
||||
};
|
||||
meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
|
||||
};
|
||||
|
||||
SpaceVim = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceVim";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "b737573667d1212ff4c76ed2a999c84c966da83d";
|
||||
sha256 = "10v89a853dakhgmmlpf6gig16764w481jy4acw0h7nrqn28y4qfr";
|
||||
rev = "bd4a67e98b2b3de690a288ae3af68232f2c41738";
|
||||
sha256 = "0l8p48zw0svcpn48v1qck6wfr5ljdfs5r96vchvbhnlg7bcivpi1";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
|
|
@ -486,12 +486,12 @@ final: prev:
|
|||
|
||||
aerial-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "aerial.nvim";
|
||||
version = "2023-06-17";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "c30fb2c9bd09592351eed676f4c20e7a6411020e";
|
||||
sha256 = "07nkrlaar7j8bgby6bij50kxi17ha5jzl4bwvwkgrrlj08v96if3";
|
||||
rev = "c663d1b55f002930187a09b9eeb5bd0bad0ea23c";
|
||||
sha256 = "0rcf3wlzqb6a4y1jvr3w3yxpik5ykhrdzcnyxw39cr55h94i6xyz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
|
|
@ -847,12 +847,12 @@ final: prev:
|
|||
|
||||
autoclose-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "autoclose.nvim";
|
||||
version = "2023-05-29";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "m4xshen";
|
||||
repo = "autoclose.nvim";
|
||||
rev = "2321727fd10a6b34624723bc4747d8c09c10b7a4";
|
||||
sha256 = "0bbf4lfs6li6mdifzlk9y2z4lgksl4xpvk0h1bd2l24x768mmm0k";
|
||||
rev = "469782b0456f0b4f764378ffda94c18599544e09";
|
||||
sha256 = "0qj2qvyjh4a70wykwlijj9h73i06npl8h88g7bb1vifsp5yyshzv";
|
||||
};
|
||||
meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
|
||||
};
|
||||
|
|
@ -1399,12 +1399,12 @@ final: prev:
|
|||
|
||||
cmp-conjure = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-conjure";
|
||||
version = "2022-12-05";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaterJason";
|
||||
repo = "cmp-conjure";
|
||||
rev = "d76e1fe5d724afe604dfa7b4b5ba93f3d3730617";
|
||||
sha256 = "026kmjrhfwqllr8qh0z4jgdl2fcxy4cqf33yy4lnalkgvapnja5s";
|
||||
rev = "d97816d5007be2b060f3a4e09f5b144d97d96fe8";
|
||||
sha256 = "0nl61si8las2lmx1mrds2csha1747lwnmv4jf0rm4qz0mqhfb4ij";
|
||||
};
|
||||
meta.homepage = "https://github.com/PaterJason/cmp-conjure/";
|
||||
};
|
||||
|
|
@ -1591,12 +1591,12 @@ final: prev:
|
|||
|
||||
cmp-nvim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-nvim-lsp";
|
||||
version = "2023-02-06";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "cmp-nvim-lsp";
|
||||
rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef";
|
||||
sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg";
|
||||
rev = "44b16d11215dce86f253ce0c30949813c0a90765";
|
||||
sha256 = "1ny64ls3z9pcflsg3sd7xnd795mcfbqhyan3bk4ymxgv5jh2qkcr";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
|
||||
};
|
||||
|
|
@ -1963,12 +1963,12 @@ final: prev:
|
|||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "c620cea17f898c6c66961f09d05cb2c0fa5ffcd8";
|
||||
sha256 = "1h2972cffs0qacjcsq3sl99935633bcg7rgygazg1qga96a47si3";
|
||||
rev = "23348d55415a0d1e227a36d4217a2751528aebf2";
|
||||
sha256 = "0j0w5m2xmzv6amj5hir9xyvq932yzisqhxnb3nmv9j63pwl06q7y";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
|
|
@ -2251,12 +2251,12 @@ final: prev:
|
|||
|
||||
copilot-vim = buildVimPluginFrom2Nix {
|
||||
pname = "copilot.vim";
|
||||
version = "2023-04-28";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "copilot.vim";
|
||||
rev = "1358e8e45ecedc53daf971924a0541ddf6224faf";
|
||||
sha256 = "171ypwb85ya8n63zykdnb8d4ni2jbn728x7r6ph1m67k06g0w4pb";
|
||||
rev = "98c293994f1bbebd5bade5d5840ead3b2feb5074";
|
||||
sha256 = "1wm36wba1pcmr0slmdvgjixm587sm13zcsdrc2cykra54p87ky2m";
|
||||
};
|
||||
meta.homepage = "https://github.com/github/copilot.vim/";
|
||||
};
|
||||
|
|
@ -2299,12 +2299,12 @@ final: prev:
|
|||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-06-18";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "3d76374ab24a6730973ed6a93f9f7b3b6640cc50";
|
||||
sha256 = "1gkg2iiswnviq07dzpij62lzjsrlapg7c9v4psl25l727l1ddi8y";
|
||||
rev = "54b069140e1240f8f244d74636c0e911e1337520";
|
||||
sha256 = "0bplg5lcrb3bhpqpsw10z56wwfnkfvsr3fzm7747j3idlqspjy27";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
|
@ -2913,24 +2913,24 @@ final: prev:
|
|||
|
||||
dressing-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dressing.nvim";
|
||||
version = "2023-06-16";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "dressing.nvim";
|
||||
rev = "5fb5cce0cbfcedeadbcee43e5674e8c9a9f28d4a";
|
||||
sha256 = "0qjvmgpjpbxar8dyaz3wpp3pisgnwr3mi7ci4nk8zckd4jb11017";
|
||||
rev = "1cbc4eef2ef7d745aa1a559b22589e33860cf077";
|
||||
sha256 = "0nmb3wiyk21254z4jxnhw2agbg0mfx7kj9fk92zr482i71qz9rlc";
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
|
||||
};
|
||||
|
||||
dropbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "15f32c0b1c646b5608b52440599577799ce20425";
|
||||
sha256 = "05zhsjbndlklxlnb9dv3pj790r0ck91c4sv1svpclaim8mjhv9ch";
|
||||
rev = "b00ede8cbde4129249ce2476fed657fe3293edb7";
|
||||
sha256 = "0k1di9b0irqc9f2bvsyadbnk35wmd7sw71v50fz2p1fm05h53h5d";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
|
|
@ -3083,12 +3083,12 @@ final: prev:
|
|||
|
||||
eyeliner-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "eyeliner.nvim";
|
||||
version = "2023-04-26";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jinh0";
|
||||
repo = "eyeliner.nvim";
|
||||
rev = "fa3a0986cb072fe2ab29ef79e022514d2533f0db";
|
||||
sha256 = "072qnpn30sz72gwppsdg9npbr897a2xlh1wj0706n58lkd7nhl2v";
|
||||
rev = "214e6ff4a0c786b9facac9d2bd267f08cc5fc0bb";
|
||||
sha256 = "0fa5y8vgydi63xk99dgryhvcja0zq7jb004bm1fd3g4dd0jpvgar";
|
||||
};
|
||||
meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
|
||||
};
|
||||
|
|
@ -3238,6 +3238,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/andviro/flake8-vim/";
|
||||
};
|
||||
|
||||
flash-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flash.nvim";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "flash.nvim";
|
||||
rev = "188666c2d76347e46fc8527f9428fd48693b469c";
|
||||
sha256 = "190jjnwsl7nsf2zljwlrl14gpq2ragrx99ydhli7cgvnwiwwkcnq";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/flash.nvim/";
|
||||
};
|
||||
|
||||
flatten-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flatten.nvim";
|
||||
version = "2023-04-23";
|
||||
|
|
@ -3348,12 +3360,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "01f80274100fe3ff6c9183b9c0674a520141be4d";
|
||||
sha256 = "1pxbbdjq25ri5jhwl953020xwbzhy564m35xz9vhnv8i2wz8kg2l";
|
||||
rev = "5749f093759c29e3694053d048ceb940fe12c3d3";
|
||||
sha256 = "1shzw4886qifn90n5kpjhz9iqckqmfgfwmfk9ahkggd6l5844rw9";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -4523,12 +4535,12 @@ final: prev:
|
|||
|
||||
lazy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lazy.nvim";
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lazy.nvim";
|
||||
rev = "c1aad95243f0d180f41348be26b2417547fb168b";
|
||||
sha256 = "0w4a2c6yxnf6q589sc7gmmsq2i76isr6pz8pyc75aj6isq3r4jrn";
|
||||
rev = "b7043f2983d7aead78ca902f3f2053907081859a";
|
||||
sha256 = "1dc8mc9lghxxbk94c8qwny55f7190zwlvip18zajj4bf9a116kpb";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lazy.nvim/";
|
||||
};
|
||||
|
|
@ -4583,24 +4595,24 @@ final: prev:
|
|||
|
||||
leap-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "leap.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "leap.nvim";
|
||||
rev = "2d7d35ea0da1b4478436dfbbb7440be91605b503";
|
||||
sha256 = "0ihy5xpxzdg603dd31vbzcdj48gc5khr2d72r97ryc57afmriy28";
|
||||
rev = "0e5a8b684b577a1d1af53499007e9b84f6323e45";
|
||||
sha256 = "14mqp0l6gwhgg6sz592cdzkrh82gv2wa6l094spyyhz6f598rz62";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/leap.nvim/";
|
||||
};
|
||||
|
||||
legendary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "legendary.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "legendary.nvim";
|
||||
rev = "6530106e93a0196437111678d6681c3121be7362";
|
||||
sha256 = "0ybzk88xs1095216ipki8s4ws4h3bpbrpi1cqqndclpxplhn06wg";
|
||||
rev = "d6166169f3cc2214398a6f516f2f2a0ccc2472c4";
|
||||
sha256 = "0rva1qwjjklfxjr7bn3vxv4ma4hrhjg469ynws1y69q5475vbj2v";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
|
||||
};
|
||||
|
|
@ -4631,12 +4643,12 @@ final: prev:
|
|||
|
||||
lexima-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lexima.vim";
|
||||
version = "2022-11-28";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cohama";
|
||||
repo = "lexima.vim";
|
||||
rev = "36781e59099b9b46eed564283b95938f90cd852d";
|
||||
sha256 = "1p9x56iw26kkkv3dk6z8kf1bhsysr72gsc2x1ki2mhlf2i15axbn";
|
||||
rev = "1f5dd656018f83ad03bddda216bd5c04d23ba57d";
|
||||
sha256 = "12q0pv1lax8xkmy54dlvd5c7ibq4gkbd1zlangsqc4xiq7nnq7jg";
|
||||
};
|
||||
meta.homepage = "https://github.com/cohama/lexima.vim/";
|
||||
};
|
||||
|
|
@ -5175,8 +5187,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason.nvim";
|
||||
rev = "e706d305fbcc8701bd30e31dd727aee2853b9db9";
|
||||
sha256 = "0kibx5p9f7zc4mp4rpihablfrrzrahhj777pjhjb0i46p3y0hx4r";
|
||||
rev = "664c987c3b14d2262a4e580f993a3e5045baded0";
|
||||
sha256 = "0pvxp5zdd2jxy0gkz913rny0p7k9zam5dzsdvgv8ihcdwn0c5mdg";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason.nvim/";
|
||||
};
|
||||
|
|
@ -5255,12 +5267,12 @@ final: prev:
|
|||
|
||||
mini-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mini.nvim";
|
||||
version = "2023-06-15";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "3a11a130bac227462dd226669d260c4bbe33fb5b";
|
||||
sha256 = "0xrggd6a7g05n168624k19ga05cd35fv6imhz40dznrxkqbrp7cd";
|
||||
rev = "f51265b17b8753420372a6a8d3f865fe79630513";
|
||||
sha256 = "14dvlma230mjvjvz6vfv1vgxssk776hkdjmlsavch5p2z5l97j89";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
|
|
@ -5651,12 +5663,12 @@ final: prev:
|
|||
|
||||
neodev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "78f1c370173e7689bd58d64229b4d92c5dfb2793";
|
||||
sha256 = "00lmk9dnpvp6qd8ymav6z0i07fg0pbnmf0xrhvlrbglxl09dg4ym";
|
||||
rev = "412776d881d7aa2bedbe8a2572e700f740440cad";
|
||||
sha256 = "157l5lbgsacd1b7qvf9fnj8ssdq78bgpgvr15z7rmxm40i25pqrp";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
|
|
@ -5963,12 +5975,12 @@ final: prev:
|
|||
|
||||
neotest-rust = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-rust";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rouge8";
|
||||
repo = "neotest-rust";
|
||||
rev = "e4baa0b02be7a7b9271da0a98eb82fb278a0c1e7";
|
||||
sha256 = "0rdl0a93qp01ldrmb98bz93yadadving2isksxz0m015cijrdf2s";
|
||||
rev = "3394e385cd33397d04ac703c5004ce7924ddcd99";
|
||||
sha256 = "02zk00b51jj4cxc6c5lxcppg2ayq48scqgkn41457w8zhzfj7bvb";
|
||||
};
|
||||
meta.homepage = "https://github.com/rouge8/neotest-rust/";
|
||||
};
|
||||
|
|
@ -5999,12 +6011,12 @@ final: prev:
|
|||
|
||||
neotest-vitest = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-vitest";
|
||||
version = "2023-04-16";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marilari88";
|
||||
repo = "neotest-vitest";
|
||||
rev = "f9efe9524ccba1284d5f4e41d0dc6ff91951cfcc";
|
||||
sha256 = "09bhg1g2r4nc0jr41v5j07wgfcqgfnjw4nbmhz8pizshiyqq0rah";
|
||||
rev = "41bf2f6b743f2ac5c5e9bd0949cee77ca7f2372c";
|
||||
sha256 = "0bz6h0mh8cyjf2xdnykyiijwmw9vgwvlb9nfzzjvxba8nqzgb4rq";
|
||||
};
|
||||
meta.homepage = "https://github.com/marilari88/neotest-vitest/";
|
||||
};
|
||||
|
|
@ -6227,12 +6239,12 @@ final: prev:
|
|||
|
||||
noice-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "noice.nvim";
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "noice.nvim";
|
||||
rev = "39461475d9de676bccc338876689c9e5b44bc932";
|
||||
sha256 = "11b4bv0dhy8y478p1gfw2ic47bg0x9v073ljndvcz5qcdh3qpsv9";
|
||||
rev = "7d01b45174d0d642302518275ab7cedf73e2690b";
|
||||
sha256 = "1712kai7n0cgz1gq9lxka2x83zh647y1gsvp58mh6hbv8cbv9g14";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/noice.nvim/";
|
||||
};
|
||||
|
|
@ -6323,12 +6335,12 @@ final: prev:
|
|||
|
||||
nvchad = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad";
|
||||
version = "2023-06-18";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "nvchad";
|
||||
rev = "11c839f870cfa8b75a9f847cba11fdfee7690856";
|
||||
sha256 = "17kjwwcbx0lwyn6f8zc3nl9v0wpmx7yif8rp32hzxinkz0pg35h8";
|
||||
rev = "4aa283119ac8abe8e8c4932c3f5ceb026052eebd";
|
||||
sha256 = "0xd0axz96z4a6snpdw814w56703kznmdvq8mzwp6aichd5g765rs";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/nvchad/";
|
||||
};
|
||||
|
|
@ -6443,12 +6455,12 @@ final: prev:
|
|||
|
||||
nvim-cmp = buildNeovimPlugin {
|
||||
pname = "nvim-cmp";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "8a1694ff330ed58ed29716686fcef79c28090354";
|
||||
sha256 = "00zxvwc244njvkbwbvxffrcqam37xi93r0pvcvzin4kc9npaygaq";
|
||||
rev = "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0";
|
||||
sha256 = "1gz02cy11r5bdrr0bz0xl0cmph6kpb3fv4xdnsbnxzq5jwia24m9";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
|
|
@ -6695,12 +6707,12 @@ final: prev:
|
|||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2023-06-18";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "da2f0934f08f01d9c0d348814860cb3413d4ab23";
|
||||
sha256 = "057wn6drnynrkbddgm9p8rnmzh3mqrlgy739wx3mvfax26fmg6xd";
|
||||
rev = "3ff82ebfbec4846d07ce442fb31f21f9785e87a9";
|
||||
sha256 = "1cp45lli0y5i41ws3hh888szn6vmbjqqppkm1cadkkhcw36j1kcv";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
|
@ -6731,12 +6743,12 @@ final: prev:
|
|||
|
||||
nvim-jdtls = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-jdtls";
|
||||
version = "2023-06-13";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-jdtls";
|
||||
rev = "aebfc22877ab143f907e90889e3903557183a22c";
|
||||
sha256 = "0r76y5qz86w55q0sx2jm5ps3j3nm7v5b60w4ln7vk59jz1m01a35";
|
||||
rev = "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6";
|
||||
sha256 = "0239v4y3hr3g8njd14ii79ndrk56i494nfp1rx4lzj3a2jmx0b4r";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||
};
|
||||
|
|
@ -6791,12 +6803,12 @@ final: prev:
|
|||
|
||||
nvim-lint = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lint";
|
||||
version = "2023-06-11";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-lint";
|
||||
rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096";
|
||||
sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf";
|
||||
rev = "0b99416769e87231ce37aec64b4ed91feb43a98e";
|
||||
sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||
};
|
||||
|
|
@ -6815,12 +6827,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "a51892484c2002c083a8b0a9dfcefb3a569be36d";
|
||||
sha256 = "02yxlfqlvv8nprk9mbxhw2mh52plcjka5kwbn4h8s4d49dzp396w";
|
||||
rev = "b6b34b9acf84949f0ac1c00747765e62b81fb38d";
|
||||
sha256 = "12p1flmk9qp71kmy9sgv8a5izdwk1n4fggdpmiz42wyg7znzjxmp";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -7031,12 +7043,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "8a04e2043f1d2582a5de1a7d97ff53e9e87c9d5f";
|
||||
sha256 = "123mxy80fmjvnk2bcaddkbnbf855xjqqzn2c69z5ym0bbydlkjld";
|
||||
rev = "251c5b9b15f7937bfe9a24bf3066a9944936c32d";
|
||||
sha256 = "0ii5ipxijlfbq1dx2sy027ypj006h6b8d6q4gb0gkgjp6kyb3dnb";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
|
@ -7067,12 +7079,12 @@ final: prev:
|
|||
|
||||
nvim-spectre = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spectre";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-pack";
|
||||
repo = "nvim-spectre";
|
||||
rev = "8adb05dbfbd36862d700b5c3d1c26f0febf3f10d";
|
||||
sha256 = "1swpwr78g1ygw1k5a881qnrv9dk728637a90m44f44ip5g51v95l";
|
||||
rev = "f4dc98ec45ecded2344aa3aac2d7cc43ad236858";
|
||||
sha256 = "1p2s7a18d13irrf5yg1c4hq3ffqd8a7vqr4iw70rzvllr2mwzlbm";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
|
||||
};
|
||||
|
|
@ -7151,12 +7163,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "c9d5812ba358ce9e5ae2df322550cc6bc1678538";
|
||||
sha256 = "1s6gxdg0f1wq8kw2x0frjbqq78h7ymdm91jv14ldsasagn7szmjb";
|
||||
rev = "f26596386f31d5bd74b85b7d1ab0fd90c5b98608";
|
||||
sha256 = "19ixpk7dsdyb99w41zy72j18amfw7vif6gdp2hvxrmwj0wqhwlmd";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -7235,12 +7247,12 @@ final: prev:
|
|||
|
||||
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-context-commentstring";
|
||||
version = "2023-04-18";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joosepalviste";
|
||||
repo = "nvim-ts-context-commentstring";
|
||||
rev = "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3";
|
||||
sha256 = "194v4vp3fjwmhiyy6gf7465m9c7yhhyvwvyih6gxls0bq5jmdzjs";
|
||||
rev = "7f625207f225eea97ef7a6abe7611e556c396d2f";
|
||||
sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65";
|
||||
};
|
||||
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
|
||||
};
|
||||
|
|
@ -7354,12 +7366,12 @@ final: prev:
|
|||
|
||||
oceanic-material = buildVimPluginFrom2Nix {
|
||||
pname = "oceanic-material";
|
||||
version = "2022-08-17";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "oceanic-material";
|
||||
rev = "9f2d002398d1ef0cd52315fa767b138719536c5d";
|
||||
sha256 = "1c9sbprivdhjyzxni3xzmk3lc56icd61azzvl9bb961iaag6r1c9";
|
||||
rev = "d0bb88707f4f9e6918a958c5a80aeddf6db5c652";
|
||||
sha256 = "133ylp1ji3ff9pi8446772q3afxvrmc848wf31fk5d9as4izm47p";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/oceanic-material/";
|
||||
};
|
||||
|
|
@ -7390,12 +7402,12 @@ final: prev:
|
|||
|
||||
oil-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "oil.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "oil.nvim";
|
||||
rev = "2a63f9224f8cb1349da4cf89844a161a285b18e9";
|
||||
sha256 = "0ipyc8frgfk1mhmmn78nix264bdcn9fcsz39syv61ay20iljm8fk";
|
||||
rev = "8882f6c89eccb3754221cab942904780ed6b3e62";
|
||||
sha256 = "1x91qxgj84a7ywgyfwanzxjji5ffblln8p83rfybd6jfcnir6f28";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/oil.nvim/";
|
||||
|
|
@ -7451,12 +7463,12 @@ final: prev:
|
|||
|
||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "47fbac24ecf4e75e5860c93242fbfc71234c3d4f";
|
||||
sha256 = "08zwnvw20afb574ksr89vkndf88fc5qif1942pn0rv56d0i7ppaw";
|
||||
rev = "f97db0e46ea5e55874892ac3e3cb2fc619d74c7f";
|
||||
sha256 = "10n7a19gmakv1nk96b2zsc5d3dnzasacg53iz620s0wkixrl8lsv";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
|
|
@ -8209,12 +8221,12 @@ final: prev:
|
|||
|
||||
satellite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "satellite.nvim";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "satellite.nvim";
|
||||
rev = "22c8cc5283c9533677e4b86b9d25d3beeca04667";
|
||||
sha256 = "1s1y3z7kw5w2gnq96zfah3zy6m43rwvd9gaxpy5a2nr1alniwcjw";
|
||||
rev = "5ae27c87f1da3fd0c0924b5adb8e2dd42268b4fe";
|
||||
sha256 = "1ymvzjzdrv4li8vhy7k3aj1sa4cvvn6nrq7qr2jxzlwrz7q58sjr";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
|
||||
};
|
||||
|
|
@ -8345,8 +8357,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "sg.nvim";
|
||||
rev = "11b21cdefab45895c2b585fa816dbf98831ff0f9";
|
||||
sha256 = "0ql4rrv2z36y2md12nqj5bydvymf6kkqwjj9ipnrh4c5ywbyh65x";
|
||||
rev = "f1fa0cf7f1c8d73b2631aaed9c73f706da8be4b5";
|
||||
sha256 = "1firdr23l58zdb9kvhar5ksc88ix6iy5pgifp4r9wks88k16gbr0";
|
||||
};
|
||||
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
|
||||
};
|
||||
|
|
@ -9307,12 +9319,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-06-13";
|
||||
version = "2023-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "00cf15074a2997487813672a75f946d2ead95eb0";
|
||||
sha256 = "0zfdcgs67nvhx73nmhv3ppilh9wkf2lv88pniwmf67pnks9x94i3";
|
||||
rev = "ffe35cb433192fcb5080b557c1aef14d37092035";
|
||||
sha256 = "1kac34kiwnnz3r80pyfx87r730jryqflh3f12hr8z8crzpz262yk";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -9644,12 +9656,12 @@ final: prev:
|
|||
|
||||
trouble-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "trouble.nvim";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "trouble.nvim";
|
||||
rev = "2af0dd9767526410c88c628f1cbfcb6cf22dd683";
|
||||
sha256 = "1wyiyijs7cjmn7qq2x6fgwm12zrr2sn3w5ray3d8rmrvzl0059ni";
|
||||
rev = "a3372bd2ba3a91882a6e54ed35da13a441d7c167";
|
||||
sha256 = "05cwzc2sskyijg2j2m82j0yvbh35cyabq8ms7zxi34kv2jm2pqm5";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/trouble.nvim/";
|
||||
};
|
||||
|
|
@ -9776,12 +9788,12 @@ final: prev:
|
|||
|
||||
unison = buildVimPluginFrom2Nix {
|
||||
pname = "unison";
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "677c4d935007bbe1e016f858d3e1f951b00796c5";
|
||||
sha256 = "148kwk9q5rp2pmcc4cnir8aaiq4y7r62dxggis12nk13lnpmrbxn";
|
||||
rev = "17fc0db0d876e2e8ce8522a3c4cb56429208c8b3";
|
||||
sha256 = "12hgg4jzb4ra3cnmvphzcklimf87x9fcmf1dvfn4pmcd2hnj542z";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
|
@ -11372,12 +11384,12 @@ final: prev:
|
|||
|
||||
vim-flog = buildVimPluginFrom2Nix {
|
||||
pname = "vim-flog";
|
||||
version = "2023-06-18";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbong";
|
||||
repo = "vim-flog";
|
||||
rev = "54c1b1c0762762065736ab82b1f50ec069b50475";
|
||||
sha256 = "1j8miaw8hj6wv245sb2a9p4w54yac7b60zlsqzyqvj89qbkcq61x";
|
||||
rev = "72f80973021957741ceca35e488fce5b430faeea";
|
||||
sha256 = "1q7svpk0hq3rn335dxqz0l2nqxfgq5xid12955q2kxgvnq2nhc81";
|
||||
};
|
||||
meta.homepage = "https://github.com/rbong/vim-flog/";
|
||||
};
|
||||
|
|
@ -11576,12 +11588,12 @@ final: prev:
|
|||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "397a9c5796a5082b55b71dd3b55152dcf53261de";
|
||||
sha256 = "1nhcbzi80k9x2g8cf3l7072ln5b9a5vgfplpzhjj9q7iqswhg4bg";
|
||||
rev = "12de6c0bc0efce3cedc5e28d4fe0ecc3a4aaeb77";
|
||||
sha256 = "0y576h385h9m7d8wic2b2743v8l4vvpcly6fk5siwziqbq2j082h";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
|
|
@ -12406,12 +12418,12 @@ final: prev:
|
|||
|
||||
vim-lsp-settings = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp-settings";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "vim-lsp-settings";
|
||||
rev = "b986f8c10056faf289d692ea816bfc22b780e425";
|
||||
sha256 = "0kz39yg96284fa33zsblg8bqb5snwx39slm8dv58w3mrifc1bkh1";
|
||||
rev = "da214dcc8d56ff1aa91f0661c8d16f6771e2231b";
|
||||
sha256 = "00wvfi39fpmn2zmn2hnamvi9m6fwp2vb12y73fjqldn483ml1hjl";
|
||||
};
|
||||
meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
|
||||
};
|
||||
|
|
@ -13703,12 +13715,12 @@ final: prev:
|
|||
|
||||
vim-slime = buildVimPluginFrom2Nix {
|
||||
pname = "vim-slime";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpalardy";
|
||||
repo = "vim-slime";
|
||||
rev = "69fd61ba2b1fe1e0c13d09fef24290ba5ed6a85f";
|
||||
sha256 = "1fzka877p9clfhh8jdf99c2d1wlyizgqdw6lzx1nrgsv53ayhd7l";
|
||||
rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38";
|
||||
sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpalardy/vim-slime/";
|
||||
};
|
||||
|
|
@ -14460,12 +14472,12 @@ final: prev:
|
|||
|
||||
vim-vsnip-integ = buildVimPluginFrom2Nix {
|
||||
pname = "vim-vsnip-integ";
|
||||
version = "2023-03-12";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "vim-vsnip-integ";
|
||||
rev = "1930f0fc234521945afd48db2bff09d925211571";
|
||||
sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k";
|
||||
rev = "6bb0fff309b0e87509915c6101808f41a16d6f48";
|
||||
sha256 = "0n0mxynfy176yn8nm7aafhmwvfg0l409cnf8d2ix1fa8c74b8lk6";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
|
||||
};
|
||||
|
|
@ -14821,12 +14833,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "2b31261b20e44c4b3c79ca7e42e2f9a5cdbe8cd3";
|
||||
sha256 = "1iv1qmbbz1q48x04l2d9cm10wrb4kf8xw9qnp2z2s4niy36w5345";
|
||||
rev = "efd8248abf7f2cdee13dd27c1d506ddfa788587c";
|
||||
sha256 = "09vnqcg52fnasdx2f3vqira0qph6icssf6kzg8gysjrbbg9kypxb";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
@ -14845,12 +14857,12 @@ final: prev:
|
|||
|
||||
vimwiki = buildVimPluginFrom2Nix {
|
||||
pname = "vimwiki";
|
||||
version = "2023-06-16";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimwiki";
|
||||
repo = "vimwiki";
|
||||
rev = "88620a2be0d47e74639b15c71f7e170bb3b2d432";
|
||||
sha256 = "1hw19wkrv98qvynak6ag79dffxafiv574bg52886wglrrimhl1y1";
|
||||
rev = "942da42b96251b5b9bef4e54bb79884ebf86c1f4";
|
||||
sha256 = "1kmjr26wyn1na9g7m6607vjk4g5yhdapsmlcv62myb9g58r0knpl";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimwiki/vimwiki/";
|
||||
};
|
||||
|
|
@ -15266,12 +15278,12 @@ final: prev:
|
|||
|
||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2023-06-21";
|
||||
version = "2023-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "d32b0bb5b1033920de5026e326869838aba856ee";
|
||||
sha256 = "15yc9ld6nybs9cfb2gncygxif1qd0g69nfppp2qcwgyhw7kynnij";
|
||||
rev = "506a4aa13443e0104ea49b99947cc09488d0791d";
|
||||
sha256 = "0694njpibbmnvlllvf42c7l350m33fxbjzdx9fjv6jz42a6zqwr5";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
|
|
@ -15290,12 +15302,12 @@ final: prev:
|
|||
|
||||
chad = buildVimPluginFrom2Nix {
|
||||
pname = "chad";
|
||||
version = "2023-06-18";
|
||||
version = "2023-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "260312b5c60f5fc3299da4357690ba6bf4485387";
|
||||
sha256 = "0zcrq7hlmsjhcj0y5wjipafsxll5q8vj86cf1hcknvnq341sccxk";
|
||||
rev = "128b0f8fe46db9b696a747b7c70088ebfc0e0044";
|
||||
sha256 = "1ll2ihi42lvshxi7n7lmydyp32aglfsanqa72xa3b16say1y6a0q";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "0.0.0+rev=2caedf3";
|
||||
version = "0.0.0+rev=da8cae9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "2caedf3e9eb314551a3a6cc9d3b6c4fcdee37747";
|
||||
hash = "sha256-YLBgsYPx2nv0mTZ3KqNeeZ09ZqzPeiJ6i3VR3+iW/p0=";
|
||||
rev = "da8cae9ce365a81dcba25256f76c713674121017";
|
||||
hash = "sha256-axsaq4znP4A57oGKZJrjLrq+Yx4zVV2IssjMYVCQ2cI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
|
|
@ -137,12 +137,12 @@
|
|||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "0.0.0+rev=8acd38d";
|
||||
version = "0.0.0+rev=1648e21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c-sharp";
|
||||
rev = "8acd38dae01bea4157f729325f5c69d0b47a75f2";
|
||||
hash = "sha256-BaFM4bN0yAEKyYF0wQ+ZBDsSK1ObdOXA3sZ/9ZlD88w=";
|
||||
rev = "1648e21b4f087963abf0101ee5221bb413107b07";
|
||||
hash = "sha256-WvkHtw8t14UNqiJvmS9dbGYQSVVzHS9mcWzxq+KLMnU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
|
|
@ -247,12 +247,12 @@
|
|||
};
|
||||
cpp = buildGrammar {
|
||||
language = "cpp";
|
||||
version = "0.0.0+rev=2e29f23";
|
||||
version = "0.0.0+rev=0e7b7a0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-cpp";
|
||||
rev = "2e29f23abcb5f92ddffb22de8b292f09ed78db01";
|
||||
hash = "sha256-qIblqwUpQNfW7v5EugXck8UucGU4n+OWsS8+KgEDtkM=";
|
||||
rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d";
|
||||
hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
|
||||
};
|
||||
|
|
@ -986,12 +986,12 @@
|
|||
};
|
||||
lalrpop = buildGrammar {
|
||||
language = "lalrpop";
|
||||
version = "0.0.0+rev=7744b56";
|
||||
version = "0.0.0+rev=b7431e4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "traxys";
|
||||
repo = "tree-sitter-lalrpop";
|
||||
rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e";
|
||||
hash = "sha256-xz+D1lS/bpHHu2rJEjalpMajSKl3yn+bQI9JN0Bm7tU=";
|
||||
rev = "b7431e4b64183a5d0d094895a4cd5daf51ed3103";
|
||||
hash = "sha256-P7A/MFmnCHq5rn+QSogbRD3joT7OxC+F9v2oMQ+DZBE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
|
||||
};
|
||||
|
|
@ -1096,36 +1096,36 @@
|
|||
};
|
||||
markdown = buildGrammar {
|
||||
language = "markdown";
|
||||
version = "0.0.0+rev=231f316";
|
||||
version = "0.0.0+rev=936cc84";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164";
|
||||
hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck=";
|
||||
rev = "936cc84289f6de83c263ae8e659fb342867ceb16";
|
||||
hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM=";
|
||||
};
|
||||
location = "tree-sitter-markdown";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
};
|
||||
markdown_inline = buildGrammar {
|
||||
language = "markdown_inline";
|
||||
version = "0.0.0+rev=231f316";
|
||||
version = "0.0.0+rev=936cc84";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164";
|
||||
hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck=";
|
||||
rev = "936cc84289f6de83c263ae8e659fb342867ceb16";
|
||||
hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM=";
|
||||
};
|
||||
location = "tree-sitter-markdown-inline";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
};
|
||||
matlab = buildGrammar {
|
||||
language = "matlab";
|
||||
version = "0.0.0+rev=138f2ee";
|
||||
version = "0.0.0+rev=26c5255";
|
||||
src = fetchFromGitHub {
|
||||
owner = "acristoffers";
|
||||
repo = "tree-sitter-matlab";
|
||||
rev = "138f2ee2eaadcff53ef1fce944713942af92c097";
|
||||
hash = "sha256-fVAchZULNxp8Jtl632hRClaR2FKWF5C5OW0QpjihGf0=";
|
||||
rev = "26c525577c7349b8d9805d244cacd8ef98807b78";
|
||||
hash = "sha256-nvjqmyVcVfTkuMFyDWWJLZNN/SeiNwLrQU6qfvQqpmw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
|
||||
};
|
||||
|
|
@ -1231,24 +1231,24 @@
|
|||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=2da4930";
|
||||
version = "0.0.0+rev=82e103c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "2da49308381b91e19e5d270ec5117616d0e4b135";
|
||||
hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ=";
|
||||
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
|
||||
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
|
||||
};
|
||||
location = "ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=2da4930";
|
||||
version = "0.0.0+rev=82e103c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "2da49308381b91e19e5d270ec5117616d0e4b135";
|
||||
hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ=";
|
||||
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
|
||||
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
|
||||
};
|
||||
location = "interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
|
|
@ -1377,12 +1377,12 @@
|
|||
};
|
||||
pony = buildGrammar {
|
||||
language = "pony";
|
||||
version = "0.0.0+rev=5fd795a";
|
||||
version = "0.0.0+rev=16f930b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-pony";
|
||||
rev = "5fd795ae7597b568b0a356c5d243cc92162bc00c";
|
||||
hash = "sha256-uwxqbWK3Zy5heGQ3aSX73X6wY0FY3ewqjsQXgDl8nb0=";
|
||||
rev = "16f930b250433cfcd4fb4144df92bb98ad344c20";
|
||||
hash = "sha256-UamgLmI1aI5e/JlGVZzFCPgDol8MnFomncrFKhQYLsk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-pony";
|
||||
};
|
||||
|
|
@ -1608,12 +1608,12 @@
|
|||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "0.0.0+rev=a5c4c29";
|
||||
version = "0.0.0+rev=cda0de8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "a5c4c29b95aca29dea71f34bf046ad0b36499045";
|
||||
hash = "sha256-R7503gLEWdktp/OKBc2hCAf6YzS4RInzYU99ohLJZ+g=";
|
||||
rev = "cda0de8a038b0e4ad79a97f7aa281250fcf88560";
|
||||
hash = "sha256-739c8THPQchATVQqaE5sAAg2aW5x8NXyn7OUT5yDRQs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
|
|
@ -1696,12 +1696,12 @@
|
|||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=7cbac04";
|
||||
version = "0.0.0+rev=d38db87";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d";
|
||||
hash = "sha256-jUetr81AvJr2igJqCKG1Mt6REDTeeyFpgQNRRRwMJXw=";
|
||||
rev = "d38db87c3e979a692cd542be44524f7f5e46f965";
|
||||
hash = "sha256-PT7joV3kA8LqB6t/bhahxNsp8zfOKNWQIT8gQ4UnqY4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
|
|
@ -1910,12 +1910,12 @@
|
|||
};
|
||||
twig = buildGrammar {
|
||||
language = "twig";
|
||||
version = "0.0.0+rev=2457993";
|
||||
version = "0.0.0+rev=779ee5a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "tree-sitter-twig";
|
||||
rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8";
|
||||
hash = "sha256-8H2luJtjSZt2AWP1L0A64jm+DeEH8cFaC+yvIDLKk4o=";
|
||||
rev = "779ee5ab1e065dcef7f51f253030dc875445b25f";
|
||||
hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -271,6 +271,7 @@ https://github.com/j-hui/fidget.nvim/,,
|
|||
https://github.com/bogado/file-line/,,
|
||||
https://github.com/glacambre/firenvim/,HEAD,
|
||||
https://github.com/andviro/flake8-vim/,,
|
||||
https://github.com/folke/flash.nvim/,HEAD,
|
||||
https://github.com/willothy/flatten.nvim/,HEAD,
|
||||
https://github.com/ggandor/flit.nvim/,HEAD,
|
||||
https://github.com/ncm2/float-preview.nvim/,,
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megapixels";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = "megapixels";
|
||||
rev = version;
|
||||
hash = "sha256-xrO9Xr9DPjlDs4yaKy32yb4X8wFqLKfy8rsjtBuN+Rg=";
|
||||
hash = "sha256-ZkTDHDL5nhpR8PKqia12pbrEZLnRXEm8DwBYdYrP5Qo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,26 +3,28 @@
|
|||
, fetchFromGitHub
|
||||
, bash
|
||||
, cmake
|
||||
, boost
|
||||
, xercesc
|
||||
, xalanc
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtmultimedia
|
||||
, qtwebkit
|
||||
, qtsvg
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "brewtarget";
|
||||
version = "2.3.1";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Brewtarget";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14xmm6f8xmvypagx4qdw8q9llzmyi9zzfhnzh4kbbflhjbcr7isz";
|
||||
sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qtbase qttools qtmultimedia qtwebkit qtsvg ];
|
||||
nativeBuildInputs = [ cmake boost xercesc xalanc ];
|
||||
buildInputs = [ qtbase qttools qtmultimedia qtsvg ];
|
||||
|
||||
preConfigure = ''
|
||||
chmod +x configure
|
||||
|
|
|
|||
|
|
@ -64,9 +64,11 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG"
|
||||
'';
|
||||
|
||||
# Use shared libraries to decrease size
|
||||
buildFlags = [ "shared" ];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"shared=yes"
|
||||
"USE_SYSTEM_LIBS=yes"
|
||||
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
|
||||
] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "115.0b7";
|
||||
version = "115.0b9";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "4ae6b74e7a47c06c3630c911d5bbcd6c390f1462f4335c8fd084cf455675c88872864390e22847da16564484b70fbac09625015fc6a4cf10a01ed8052016991e";
|
||||
sha512 = "26e030143c09daef8fcdde55ebd020828025694d354e5f1e51308275af07b4c44aef325bb74e5e289b89d469822b2380a4abf47103972f46f12dfd9ac8fad830";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@
|
|||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "115.0b7";
|
||||
version = "115.0b9";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "f360ca7c5eb69d16a54b37a95195f4981c19e7e081cf7d494dafc1838ec69f2beabae5eaed23b0b551e71b32e3d0213383bc43e63416d390aa453bfa8b0f1993";
|
||||
sha512 = "8d2a0dc2c64f8fc846077165ea0c97cae04a85db9ffcd23fbf933b25f165ecd85727ba2f432842f2d2f41c5b5bef5eb4ae2536d8492888c334aba0dcec278c47";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, testers
|
||||
, karmor
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
|
|
@ -15,6 +21,13 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/kubearmor/kubearmor-client/selfupdate.BuildDate=1970-01-01"
|
||||
"-X=github.com/kubearmor/kubearmor-client/selfupdate.GitSummary=${version}"
|
||||
];
|
||||
|
||||
# integration tests require network access
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -26,6 +39,13 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/karmor completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = karmor;
|
||||
command = "karmor version || true";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client tool to help manage KubeArmor";
|
||||
homepage = "https://kubearmor.io";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,7 +5,6 @@
|
|||
, buildGoModule
|
||||
, esbuild
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
|
|
@ -13,31 +12,12 @@
|
|||
, pkg-config
|
||||
, python3
|
||||
, roboto
|
||||
, rustPlatform
|
||||
, sqlcipher
|
||||
, stdenv
|
||||
, CoreServices
|
||||
}:
|
||||
|
||||
let
|
||||
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
|
||||
version = "1.117.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zKOhjV2q+jKoh5KVb+izbRzq0kAFp3pXdnPTf9PAhGs=";
|
||||
};
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
|
||||
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
|
||||
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
|
||||
"quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg=";
|
||||
};
|
||||
};
|
||||
});
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.14.54";
|
||||
|
|
@ -50,7 +30,8 @@ let
|
|||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
};
|
||||
in buildNpmPackage rec {
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.38.1";
|
||||
|
||||
|
|
@ -72,7 +53,7 @@ in buildNpmPackage rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libdeltachat'
|
||||
libdeltachat
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "5.1";
|
||||
version = "5.2";
|
||||
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-imWB3ffHQJ22NlEGATUa9yTto2OrWbHV2o2YEDPyb3I=";
|
||||
hash = "sha256-SCYXa35wu4ifmcIG+v+t2JJijXhSVxXp9xKOz0ixRoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tlaplus";
|
||||
|
|
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ adoptopenjdk-bin ];
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
|
|
@ -33,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ florentc thoughtpolice ];
|
||||
maintainers = with lib.maintainers; [ florentc thoughtpolice mgregson ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, fetchFromGitHub, python3, git, git-filter-repo }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "git-relevant-history";
|
||||
version = "2022-09-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rainlabs-eu";
|
||||
repo = pname;
|
||||
rev = "84552324d7cb4790db86282fc61bf98a05b7a4fd";
|
||||
hash = "sha256-46a6TR1Hi3Lg2DTmOp1aV5Uhd4IukTojZkA3TVbTnRY=";
|
||||
};
|
||||
propagatedBuildInputs = [
|
||||
git git-filter-repo
|
||||
python3.pkgs.docopt
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extract only relevant history from git repo";
|
||||
homepage = "https://github.com/rainlabs-eu/git-relevant-history";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.bendlas ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "srvc";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilica";
|
||||
repo = "rs-srvc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o6BX8NnBdHQ5FMD3Dm8gfHHtzvG+irn1wWAwswKKXQY=";
|
||||
hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WXHgJPOgGC8+/kgekiUmQv+1Z1+Y3mPw5MaaMVZlToA=";
|
||||
cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
{ runCommand }:
|
||||
{ runCommand, lib }:
|
||||
|
||||
firmware:
|
||||
|
||||
runCommand "${firmware.name}-xz" {} ''
|
||||
let
|
||||
args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
|
||||
in
|
||||
|
||||
runCommand "${firmware.name}-xz" args ''
|
||||
mkdir -p $out/lib
|
||||
(cd ${firmware} && find lib/firmware -type d -print0) |
|
||||
(cd $out && xargs -0 mkdir -v --)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tela-icon-theme";
|
||||
version = "2023-02-03";
|
||||
version = "2023-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
repo = "tela-icon-theme";
|
||||
rev = version;
|
||||
sha256 = "sha256-W3gGn4ioTg/iOWTa5hfwx6FWzpFilpG8IXwaO5/YAvk=";
|
||||
hash = "sha256-tv0C4mW2A3dScUXBWa7a3lkG4lPIjZTsj5b1/oEVuiw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
|
@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A flat colorful Design icon theme";
|
||||
homepage = "https://github.com/vinceliuice/tela-icon-theme";
|
||||
changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}";
|
||||
license = licenses.gpl3Only;
|
||||
# darwin systems use case-insensitive filesystems that cause hash mismatches
|
||||
platforms = subtractLists platforms.darwin platforms.unix;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ ocamlPackages.buildDunePackage rec {
|
|||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-NGjys54VWzgy1SE93/zt8xooJhnZTst3jsjU36yp7Uk=";
|
||||
sha256 = "sha256-XHfpYX0lXzT15fuFQcmRBhhaKI9Y4bYOy6kXR320BV0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2304.0";
|
||||
pname = "fastjson";
|
||||
version = "1.2304.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "libfastjson";
|
||||
owner = "rsyslog";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4=";
|
||||
repo = "libfastjson";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
buildInputs = [ libtool ];
|
||||
|
||||
preConfigure = ''
|
||||
sh autogen.sh
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast json library for C";
|
||||
|
|
|
|||
|
|
@ -542,9 +542,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# outputs where we don't want them. Patch the generated config.h to remove all
|
||||
# such references except for data.
|
||||
postConfigure = let
|
||||
toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir.
|
||||
toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir.
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc;
|
||||
in
|
||||
"remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h";
|
||||
"remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h";
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, writeText
|
||||
, rustPlatform
|
||||
, meson
|
||||
|
|
@ -112,6 +113,17 @@ let
|
|||
) (lib.attrNames validPlugins);
|
||||
|
||||
invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins;
|
||||
|
||||
# TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138
|
||||
cargo-c' = cargo-c.overrideAttrs (oldAttrs: {
|
||||
patches = (oldAttrs.patches or []) ++ [
|
||||
(fetchpatch {
|
||||
name = "cargo-c-test-rlib-fix.patch";
|
||||
url = "https://github.com/lu-zero/cargo-c/commit/596c582deed419b0cf1f80b9be77ff705df20e01.diff";
|
||||
hash = "sha256-GETjZwYqX7h51rxWznAg5Ojozdp1SOYnUh+iuRGA4/w=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in
|
||||
assert lib.assertMsg (invalidPlugins == [])
|
||||
"Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}";
|
||||
|
|
@ -165,7 +177,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
rustc
|
||||
cargo
|
||||
cargo-c
|
||||
cargo-c'
|
||||
nasm
|
||||
] ++ lib.optionals enableDocumentation [
|
||||
hotdoc
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgbinder";
|
||||
version = "1.1.33";
|
||||
version = "1.1.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mer-hybris";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tVvW7cbgj2t251SzUchfVEnHgLVgdkTLyGpQfn6VYow=";
|
||||
sha256 = "sha256-e4J7K1AZyw3AvBNMj69VGKo7gtJ6Nr2ELjqgoqPlObU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, stdenv, fetchurl, fixDarwinDylibNames }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnatpmp";
|
||||
|
|
@ -9,6 +14,14 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# install natpmp_declspec.h too, else nothing that uses this library will build
|
||||
(fetchpatch {
|
||||
url = "https://github.com/miniupnp/libnatpmp/commit/5f4a7c65837a56e62c133db33c28cd1ea71db662.patch";
|
||||
hash = "sha256-tvoGFmo5AzUgb40bIs/EzikE0ex1SFzE5peLXhktnbc=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"INSTALLPREFIX=$(out)"
|
||||
"CC:=$(CC)"
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastjet";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
|
||||
hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E=";
|
||||
hash = "sha256-BWCMb/IT8G3Z3nI4E9a03M1R5mGsEwmPdL/J7q8ctao=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional withPython python;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.34";
|
||||
version = "0.5.35";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gnNncWhrqGTWq8cNVmNMzkgqW0hoglzVGrLjqyUvOIc=";
|
||||
hash = "sha256-gHHLKviU1ZHrlBp4R3WqAwEGWiM7VuB7lOYiUIJ1J7A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,25 +19,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mail";
|
||||
version = "1.2.8";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sabuhish";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9u7+TYO0TmzyLcCxZL86ibC3hNH5b722t5fWimRHaW0=";
|
||||
hash = "sha256-ttVzjmMZe1iWn2J7N5pcol4GFnKv3CB3DOQkZU2HnHg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "1.2.2"' 'version = "${version}"' \
|
||||
--replace 'version = "1.2.5"' 'version = "${version}"' \
|
||||
--replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \
|
||||
--replace 'pydantic = "^1.8"' 'pydantic = "*"' \
|
||||
--replace 'starlette = "^0.22.0"' 'starlette = "*"' \
|
||||
--replace 'black = "^22.12.0"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.6.0";
|
||||
version = "2023.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xpkQSQGwf4RZHKwLdrOLW4yzECKY1vwxHYo+o3eOrhE=";
|
||||
hash = "sha256-67zl530tvA7h4bpC9qasVsvjzoN9fxtPO9TZmxvABlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
64
pkgs/development/python-modules/matplotx/default.nix
Normal file
64
pkgs/development/python-modules/matplotx/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, matplotlib
|
||||
, numpy
|
||||
, networkx
|
||||
, pypng
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matplotx";
|
||||
version = "0.3.10";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nschloe";
|
||||
repo = "matplotx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
matplotlib
|
||||
numpy
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
networkx
|
||||
pypng
|
||||
scipy
|
||||
];
|
||||
contour = [ networkx ];
|
||||
spy = [
|
||||
pypng
|
||||
scipy
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = passthru.optional-dependencies.all;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged)
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "matplotx" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nschloe/matplotx";
|
||||
description = "More styles and useful extensions for Matplotlib";
|
||||
changelog = "https://github.com/nschloe/matplotx/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ swflint ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,31 +1,49 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, enum34, pyyaml, pytest
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.28.0";
|
||||
pname = "mt-940";
|
||||
version = "4.30.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolph";
|
||||
repo = "mt940";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t6FOMu+KcEib+TZAv5uVAzvrUSt/k/RQn28jpdAY5Y0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optional (!isPy3k) enum34;
|
||||
|
||||
nativeCheckInputs = [ pyyaml pytest ];
|
||||
|
||||
# requires tests files that are not present
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
py.test
|
||||
postPatch = ''
|
||||
sed -i "/--cov/d" pytest.ini
|
||||
sed -i "/--no-cov/d" pytest.ini
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mt940" ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pyyaml
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mt940"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
|
||||
description = "Module to parse MT940 files and returns smart Python collections for statistics and manipulation";
|
||||
homepage = "https://github.com/WoLpH/mt940";
|
||||
changelog = "https://github.com/wolph/mt940/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdm-backend";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdm-project";
|
||||
repo = "pdm-backend";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-asW5L9jS++9ovq7WFh0rU7aB7R2rwi5ce80Hxk9NrI4=";
|
||||
hash = "sha256-g8VL5nO180XplMgbbeeJIp6lmbWcMKdY/IftlkL6e5U=";
|
||||
};
|
||||
|
||||
env.PDM_BUILD_SCM_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrive2";
|
||||
version = "1.15.4";
|
||||
version = "1.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyDrive2";
|
||||
inherit version;
|
||||
hash = "sha256-DAEbdOvCTzxspyggYmt38d/groj1dAxaXPlug915upk=";
|
||||
hash = "sha256-u9yNLgAuT4fSD5vYSfk/1lieu0Da2X+UtvOCtP/Ws8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezviz";
|
||||
version = "0.2.1.3";
|
||||
version = "0.2.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "baqs";
|
||||
repo = "pyEzviz";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-myf8+yGXx9Ry1NuqRLYLh3I2ubS1DLfhQF1mvp5xiwc=";
|
||||
hash = "sha256-3NeXAqEoRJMzg/Io9WF93GFJHEjAaHNn4/lBVKc2Q3Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
pname = "pyglet";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-koL5SXwcDNyyzDnYwFCQz2ht7bnrvvSo3kmvIqCuDo8=";
|
||||
hash = "sha256-xc+aEywcAaZ/VL959aTNi0Rm1Cb1aFIDMHij9nzYg8Y=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-95i/7dSXOL7OgqrBWy2X8EV4zLFXLzR6NQy3BN9NDhA=";
|
||||
hash = "sha256-MobeeelKkU5KFIFP/+Ny0ktzTnhKzX+fpzTuODrfjG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -120,9 +120,6 @@ let
|
|||
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
|
||||
'';
|
||||
|
||||
# Silence the depreciation warning from SqlAlchemy
|
||||
SQLALCHEMY_SILENCE_UBER_WARNING = 1;
|
||||
|
||||
# TimeoutErrors on slow machines -> aarch64
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.8";
|
||||
version = "0.18.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yFMPUvRh+sP45qGf65QXmrqy2mBlGZsSizeeV53DvP0=";
|
||||
hash = "sha256-sNVRn80IKG14OVaBGy58f+WXCMwRCZC4hAh+sN3ulR4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.12.2";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-mbJ9CzJxhAxYByfNpNux/zOWBGaiH4fvIRIh+BMprMk=";
|
||||
sha256 = "sha256-OieIbWgc5l7HS6otkRxsKYQmNIjPbADQ+C3A6qJr2h0=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-Wx0tXrw3Y3Of3aZNYiD9EVYKFpqA3kqe5tFqppoe0A0=";
|
||||
vendorSha256 = "sha256-0Svz0VFmNW/f8Po+DpIQi0bJB1ICLcSJM1sG/Nju+ZY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2023-06-19";
|
||||
version = "unstable-2023-06-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "23b1c804cb4a6d9d38d093ca3400e90805d4c36c";
|
||||
sha256 = "sha256-cKnu28L8tjndjtHuClLIpiwTzf6YoN37vw1sE7xrNzQ=";
|
||||
rev = "c05b95997a127cebef76d3b238e0341086e59e32";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fCIBv8FOUBPzf7I7CdVBDvbHVyuNQRURxNQ7B7cgoKE=";
|
||||
cargoSha256 = "sha256-OHtg3za8EyQVYQ6XQzLK7UgvGSl8ObfeKURFL6vBDnE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "cargo-hakari-${version}";
|
||||
sha256 = "sha256-cKnu28L8tjndjtHuClLIpiwTzf6YoN37vw1sE7xrNzQ=";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PoTwS9oS8Nmkdp3ZvdZRdk028SIx6D7kfsiRksyTpKo=";
|
||||
cargoHash = "sha256-F6+GRn3l849vRVKE1KhLMnxwR5NWu1b78xTxrHi817A=";
|
||||
|
||||
cargoBuildFlags = [ "-p" "cargo-hakari" ];
|
||||
cargoTestFlags = [ "-p" "cargo-hakari" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.53";
|
||||
version = "0.9.54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-oDkPURyVLOXSnRReCEkXubj0nNeMvHNH/WqG+Wp54ek=";
|
||||
hash = "sha256-HkDGW91XDoYMfknPg6td51KTYniCfGtGQd3dkzumRpo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iXZy4pPYnf3A3mPg5Os00I//QJha68agvwhLU5vf320=";
|
||||
cargoHash = "sha256-McL5G/PtdOou17hWLiNTSJEjTh4YpT1GUPjTMAVNxQA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.15.5";
|
||||
version = "1.15.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5QrUB7p78HmwTUagYKNbFxndUKdeGd51gpqIO1O/8H4=";
|
||||
hash = "sha256-J78EJi2PXa3a83gP05b+ufDyq+BT9e1h7E/QiYs5mls=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZNWG3eKnT2LFywIQO1iLIhaUKrINdwbCsSbC55wFrF4=";
|
||||
cargoHash = "sha256-9WUzWWwZHC9OPw18Xi3krkIfNH/gdB6VPhrL80RLCvk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unityhub";
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
|
||||
sha256 = "sha256-I1qtrD94IpMut0a6JUHErHaksoZ+z8/dDG8U68Y5zJE=";
|
||||
sha256 = "sha256-d5TUUhGqchkrCRqJWHEewurjsHxbfZ+5hv9w9Yv2EQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
icu
|
||||
libpulseaudio
|
||||
|
||||
# Editor dependencies
|
||||
# Unity Editor dependencies
|
||||
libglvnd # provides ligbl
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
|
|
@ -90,6 +90,12 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
clang
|
||||
git # for git-based packages in unity package manager
|
||||
|
||||
# Unity Editor 2019 specific dependencies
|
||||
xorg.libXi
|
||||
xorg.libXrender
|
||||
gnome2.GConf
|
||||
libcap
|
||||
] ++ extraLibs pkgs;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,24 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, libressl
|
||||
, curl
|
||||
, Security
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-pack";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustwasm";
|
||||
repo = "wasm-pack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Sfcf/Dko2lAfkfYdeanLAqhbUgeKtGBxx4timZi2kCk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU=";
|
||||
cargoHash = "sha256-bl1KDFNvpNtkbKqiBRbmQLo1/oqLl7u7gNHLhhm8ETI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
# LibreSSL works around segfault issues caused by OpenSSL being unable to
|
||||
# gracefully exit while doing work.
|
||||
# See: https://github.com/rustwasm/wasm-pack/issues/650
|
||||
libressl
|
||||
] ++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
# Most tests rely on external resources and build artifacts.
|
||||
# Disabling check here to work with build sandboxing.
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.4.8";
|
||||
version = "1.4.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WiU4pTIsgwkotKLvqTL/P1CZdW20y6VQbBjoPyMCd4E=";
|
||||
hash = "sha256-g2xUBh0zRB+9awYEr15ay0k+EyAiWmGG5UfZatE24/8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-On2J/9qnUGTysCWKRoU79mE1bFz275RWjJSfHqjsAoI=";
|
||||
vendorHash = "sha256-9SeNXOl1wEcG/CtNuuYQ8Y5XEw2GYAIQ2lXk5lgXsN8=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.31";
|
||||
hash = "sha256-quYsp6h7IV6gUT0e55FeBlS8rH9OGrqdbM1XSIYNRV4=";
|
||||
version = "6.1.35";
|
||||
hash = "sha256-CfrM2CNaGUTfkVteudL8xnAuCdZJxD5pUEC1YW9LiuU=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.3.5";
|
||||
hash = "sha256-2+8WDj1VdmIdC0DjmKyY/fMi5zoiXDAWy7EAmkImvXk=";
|
||||
version = "6.3.9";
|
||||
hash = "sha256-t1fKPZ+giANPmhM4zGoGtYWJF6rDnbpJaoHILl3nyRI=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sssd";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H9Snh2RzbnjGPqvC9fJHeZvAkGX/O/vmVsl143yb194=";
|
||||
sha256 = "sha256-OafSo28MN92py33foE8oMkPUmV9WUUOkKWJgm0i7MJU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b";
|
||||
sha256 = "ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -29,12 +29,6 @@ stdenv.mkDerivation rec {
|
|||
./runtime-deps.patch
|
||||
];
|
||||
|
||||
# Upstream mistake in 3.2.7: too strict constraint.
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace 'libngtcp2 = 0.13.0' 'libngtcp2 = 0.13.1'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [
|
||||
gnutls liburcu libidn2 libunistring
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-prefix-only=yes"
|
||||
"--disable-pcp" # TODO: figure out how to package its dependency
|
||||
"--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin"
|
||||
"--with-admin-group=root" # TODO: really? Maybe "wheel"?
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
61
pkgs/servers/scaphandre/default.nix
Normal file
61
pkgs/servers/scaphandre/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, powercap
|
||||
, runCommand
|
||||
, dieHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scaphandre";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hubblo-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Work around to pass test due to non existing path
|
||||
# https://github.com/hubblo-org/scaphandre/blob/v0.5.0/src/sensors/powercap_rapl.rs#L29
|
||||
export SCAPHANDRE_POWERCAP_PATH="$(mktemp -d)/scaphandre"
|
||||
|
||||
mkdir -p "$SCAPHANDRE_POWERCAP_PATH"
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
stdout = self: runCommand "${pname}-test" {
|
||||
buildInputs = [
|
||||
self
|
||||
dieHook
|
||||
];
|
||||
} ''
|
||||
${self}/bin/scaphandre stdout -t 4 > $out || die "Scaphandre failed to measure consumption"
|
||||
[ -s $out ]
|
||||
'';
|
||||
vm = nixosTests.scaphandre;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Electrical power consumption metrology agent";
|
||||
homepage = "https://github.com/hubblo-org/scaphandre";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.31";
|
||||
version = "2.35";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-zkeoj+l82aP3/rXn7JuNS4OvAGnHaVRz+xXxPEPMEs8=";
|
||||
hash = "sha256-V9Q9rjinFDFCi2snQ27R0Y9KFrYD/HLElnT8KV/3bP4=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack, groonga }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgroonga";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-iF/zh4zDDpAw5fxW1WG8i2bfPt4VYsnYArwOoE/lwgM=";
|
||||
hash = "sha256-2/dInLG8isiSJHJgNyxgbUwMd/mtcUJxcTvSnVpBZ9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ postgresql msgpack groonga ];
|
||||
buildInputs = [ postgresql msgpack-c groonga ];
|
||||
|
||||
makeFlags = [ "HAVE_MSGPACK=1" ];
|
||||
makeFlags = [
|
||||
"HAVE_MSGPACK=1"
|
||||
"MSGPACK_PACKAGE_NAME=msgpack-c"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D pgroonga.so -t $out/lib/
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proxysql";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysown";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KPTvFbEreWQBAs5ofcdVzlVqL0t5pM/mMLv4+E4lJ5M=";
|
||||
hash = "sha256-D/AUjndpu4QJmlgLBXRqMj9gsHYitEYhHVMQzoab1ik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -171,5 +171,6 @@ stdenv.mkDerivation rec {
|
|||
description = "High-performance MySQL proxy";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ ajs124 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index df7ed196..3a3b393d 100644
|
||||
index c053ab64..03f38a21 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -57,11 +57,7 @@ endif
|
||||
@@ -59,11 +59,7 @@ endif
|
||||
|
||||
export MAKEOPT=-j ${NPROCS}
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ index df7ed196..3a3b393d 100644
|
|||
USERCHECK := $(shell getent passwd proxysql)
|
||||
GROUPCHECK := $(shell getent group proxysql)
|
||||
|
||||
@@ -784,16 +780,10 @@ cleanbuild:
|
||||
@@ -868,16 +864,10 @@ cleanbuild:
|
||||
|
||||
.PHONY: install
|
||||
install: src/proxysql
|
||||
|
|
@ -36,10 +36,10 @@ index df7ed196..3a3b393d 100644
|
|||
install -m 0755 etc/init.d/proxysql /etc/init.d
|
||||
ifeq ($(DISTRO),"CentOS Linux")
|
||||
diff --git a/deps/Makefile b/deps/Makefile
|
||||
index 47c0f3c3..80d33d11 100644
|
||||
index dbe495c0..9c50bab8 100644
|
||||
--- a/deps/Makefile
|
||||
+++ b/deps/Makefile
|
||||
@@ -66,10 +66,7 @@ endif
|
||||
@@ -69,10 +69,7 @@ default: $(tmpdefault)
|
||||
|
||||
|
||||
libinjection/libinjection/src/libinjection.a:
|
||||
|
|
@ -50,8 +50,8 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
|
||||
endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -83,8 +80,6 @@ libinjection: libinjection/libinjection/src/libinjection.a
|
||||
|
||||
@@ -91,8 +88,6 @@ $(error Incompatible OpenSSL version: struct bio_st mismatch!)
|
||||
endif
|
||||
|
||||
libssl/openssl/libssl.a:
|
||||
- cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true
|
||||
|
|
@ -59,7 +59,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
# cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch
|
||||
# cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
|
||||
cd libssl/openssl && ./config no-ssl3 no-tests
|
||||
@@ -103,8 +98,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
|
||||
@@ -112,8 +107,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
|
||||
endif
|
||||
|
||||
libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
|
||||
|
|
@ -68,7 +68,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
#ifeq ($(REQUIRE_PATCH), true)
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
|
||||
cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
|
||||
@@ -122,8 +115,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
@@ -131,8 +124,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
|
||||
|
||||
|
||||
libev/libev/.libs/libev.a:
|
||||
|
|
@ -77,16 +77,16 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
|
||||
cd libev/libev && ./configure
|
||||
cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
@@ -132,8 +123,6 @@ ev: libev/libev/.libs/libev.a
|
||||
|
||||
@@ -148,8 +139,6 @@ coredumper/coredumper/src/libcoredumper.a:
|
||||
coredumper: coredumper/coredumper/src/libcoredumper.a
|
||||
|
||||
curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
|
||||
- cd curl && rm -rf curl-*/ || true
|
||||
- cd curl && tar -zxf curl-*.tar.gz
|
||||
# cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
# cd curl/curl && patch configure < ../configure.patch
|
||||
cd curl/curl && autoreconf -fi
|
||||
@@ -143,16 +132,6 @@ curl: curl/curl/lib/.libs/libcurl.a
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
@@ -161,16 +150,6 @@ curl: curl/curl/lib/.libs/libcurl.a
|
||||
|
||||
|
||||
libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
|
||||
|
|
@ -100,10 +100,10 @@ index 47c0f3c3..80d33d11 100644
|
|||
- cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.75.tar.gz
|
||||
-# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch
|
||||
-endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch
|
||||
endif
|
||||
@@ -171,8 +150,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
|
||||
@@ -186,8 +165,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
|
||||
|
||||
|
||||
lz4/lz4/lib/liblz4.a:
|
||||
|
|
@ -112,7 +112,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
lz4: lz4/lz4/lib/liblz4.a
|
||||
@@ -197,8 +174,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
@@ -213,8 +190,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
|
||||
|
||||
|
||||
libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
|
||||
|
|
@ -121,7 +121,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
|
||||
cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
@@ -282,8 +257,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
@@ -302,8 +277,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
|
||||
|
||||
|
||||
libconfig/libconfig/lib/.libs/libconfig++.a:
|
||||
|
|
@ -130,7 +130,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd libconfig/libconfig && ./configure --disable-examples
|
||||
cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
|
||||
|
||||
@@ -291,9 +264,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
|
||||
@@ -311,9 +284,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
|
||||
|
||||
|
||||
prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
|
||||
|
|
@ -140,7 +140,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
|
||||
cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
|
||||
@@ -304,10 +274,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
|
||||
@@ -324,10 +294,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a
|
||||
|
||||
|
||||
re2/re2/obj/libre2.a:
|
||||
|
|
@ -151,7 +151,7 @@ index 47c0f3c3..80d33d11 100644
|
|||
cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile
|
||||
@@ -322,8 +288,6 @@ re2: re2/re2/obj/libre2.a
|
||||
@@ -342,8 +308,6 @@ re2: re2/re2/obj/libre2.a
|
||||
|
||||
|
||||
pcre/pcre/.libs/libpcre.a:
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-06-20";
|
||||
version = "2023-06-26";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "8a6fc5c16d49368dc8f9ddd965a9e25ef652e129";
|
||||
rev = "d5f1f50ad2d62363785464d5b6eef1a009243d7a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "sha256-/t4BUntSWNES8c+ePFOPniqYp2edlgc4IWW4RKfDZsU=";
|
||||
sha256 = "sha256-QN4UTsug7pA0VjA18n/Yek77lwooVaYHZDSCr579iAk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lego";
|
||||
version = "4.12.1";
|
||||
version = "4.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NmJQkNdqki1La6yt7cFY0sAEz9Ksrx3hWmWOTUMST+g=";
|
||||
sha256 = "sha256-H6JGeLE/fzbfo8/mn5hTKcr7XfvmjOojeXLxUKGzt4w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w=";
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, wget
|
||||
, Accelerate
|
||||
, CoreGraphics
|
||||
, CoreML
|
||||
, CoreVideo
|
||||
}:
|
||||
|
||||
|
|
@ -28,7 +29,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
|
||||
buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreML CoreVideo ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
WHISPER_COREML = "1";
|
||||
WHISPER_COREML_ALLOW_FALLBACK = "1";
|
||||
};
|
||||
|
||||
makeFlags = [ "main" "stream" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones-gui";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-ge2l414kYHK3y4V837GTQ5sSxVRlU8ZYyGdBj4+vUL8=";
|
||||
hash = "sha256-SQJ6CZlvu4V9Rs+rhH4jMf0AVWs71KvRUnUxGPlgj80=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rDAUA75KCWlhf13bCucV5w9WAJ+Uw+s8sUCCeWBYJeA=";
|
||||
cargoHash = "sha256-8WLYbEbPrR8c0y+Uaxo6YGiFRt7FLHZM+1O/UZq0c7g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{ lib, python3Packages, fetchPypi, installShellFiles }:
|
||||
|
||||
let
|
||||
pypkgs = python3Packages;
|
||||
|
||||
in
|
||||
pypkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tmuxp";
|
||||
version = "1.28.1";
|
||||
|
||||
|
|
@ -19,11 +15,12 @@ pypkgs.buildPythonApplication rec {
|
|||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pypkgs.poetry-core
|
||||
python3Packages.poetry-core
|
||||
python3Packages.shtab
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pypkgs; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
colorama
|
||||
kaptan
|
||||
|
|
@ -32,9 +29,8 @@ pypkgs.buildPythonApplication rec {
|
|||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd tmuxp \
|
||||
--bash <(_TMUXP_COMPLETE=bash_source $out/bin/tmuxp) \
|
||||
--fish <(_TMUXP_COMPLETE=fish_source $out/bin/tmuxp) \
|
||||
--zsh <(_TMUXP_COMPLETE=zsh_source $out/bin/tmuxp)
|
||||
--bash <(shtab --shell=bash -u tmuxp.cli.create_parser) \
|
||||
--zsh <(shtab --shell=zsh -u tmuxp.cli.create_parser)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ let
|
|||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
||||
electron = electron_24;
|
||||
|
||||
version = "2023.5.0";
|
||||
version = "2023.5.1";
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
|
||||
sha256 = "sha256-dD9C6+GRjCMcfBse2Qq0ot8bVGyhjnd8VvpdNlrjRs4=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
|
@ -42,7 +42,7 @@ let
|
|||
pname = "bitwarden-desktop-native";
|
||||
inherit src version;
|
||||
sourceRoot = "source-patched/apps/desktop/desktop_native";
|
||||
cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
|
||||
cargoSha256 = "sha256-8U4E5q2OSZGXy2ZRn0y4Skm5Y+FiOJVU1mtzObO9UqY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -95,7 +95,7 @@ buildNpmPackage' {
|
|||
npmBuildFlags = [
|
||||
"--workspace apps/desktop"
|
||||
];
|
||||
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
|
||||
npmDepsHash = "sha256-USXWA/7wuu3i9/+/pMXREgcB+4yOpQGG5RGuUyJvuQw=";
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "eid-mw";
|
||||
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
|
||||
version = "5.1.10";
|
||||
version = "5.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fedict";
|
||||
repo = "eid-mw";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI=";
|
||||
hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.connman = lib.nixosTests.gnupg;
|
||||
passthru.tests = lib.nixosTests.gnupg;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gnupg.org";
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, withPcsc ? !enableMinimal, pcsclite
|
||||
, guiSupport ? stdenv.isDarwin, pinentry
|
||||
, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
assert guiSupport -> enableMinimal == false;
|
||||
|
|
@ -85,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.connman = lib.nixosTests.gnupg;
|
||||
passthru.tests = nixosTests.gnupg;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gnupg.org";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "saml2aws";
|
||||
version = "2.36.8";
|
||||
version = "2.36.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Versent";
|
||||
repo = "saml2aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eBgyjiospcBzUCMSMRgL3V5YyybD6aqt7gQZ7VfrmZY=";
|
||||
sha256 = "sha256-eV922fUtNAHGFxuDwTKoakSzf1lMzVg+vOeaBbOP4V0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wepAJ92IZbUZHO0HiX+JOtQ/WKydCImzHytXRUhjhAU=";
|
||||
vendorHash = "sha256-20IggKOPS+Pu4tQIdYU5SXQhu2FrW0MdCdB9dvmqs7E=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
|
|
|
|||
44
pkgs/tools/video/yaydl/default.nix
Normal file
44
pkgs/tools/video/yaydl/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, ffmpeg
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yaydl";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dertuxmalwieder";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/yaydl \
|
||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://code.rosaelefanten.org/yaydl";
|
||||
description = "Yet another youtube down loader";
|
||||
license = licenses.cddl;
|
||||
maintainers = with maintainers; [ earthengine ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2105,6 +2105,8 @@ with pkgs;
|
|||
util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
|
||||
};
|
||||
|
||||
git-relevant-history = callPackage ../applications/version-management/git-relevant-history { };
|
||||
|
||||
git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { };
|
||||
|
||||
gitRepo = git-repo;
|
||||
|
|
@ -14432,6 +14434,10 @@ with pkgs;
|
|||
|
||||
yj = callPackage ../development/tools/yj { };
|
||||
|
||||
yaydl = callPackage ../tools/video/yaydl {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
zarchive = callPackage ../tools/archivers/zarchive { };
|
||||
|
||||
zprint = callPackage ../development/tools/zprint { };
|
||||
|
|
@ -19168,8 +19174,8 @@ with pkgs;
|
|||
|
||||
openai-whisper = with python3.pkgs; toPythonApplication openai-whisper;
|
||||
|
||||
openai-whisper-cpp = callPackage ../tools/audio/openai-whisper-cpp {
|
||||
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
|
||||
openai-whisper-cpp = darwin.apple_sdk_11_0.callPackage ../tools/audio/openai-whisper-cpp {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo;
|
||||
};
|
||||
|
||||
opengrok = callPackage ../development/tools/misc/opengrok { };
|
||||
|
|
@ -26545,6 +26551,8 @@ with pkgs;
|
|||
|
||||
scalr-cli = callPackage ../tools/admin/scalr-cli { };
|
||||
|
||||
scaphandre = callPackage ../servers/scaphandre { };
|
||||
|
||||
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
|
||||
|
||||
shairport-sync = callPackage ../servers/shairport-sync { };
|
||||
|
|
@ -40336,10 +40344,7 @@ with pkgs;
|
|||
|
||||
yabasic = callPackage ../development/interpreters/yabasic { };
|
||||
|
||||
wasm-pack = callPackage ../development/tools/wasm-pack {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
libressl = libressl_3_6;
|
||||
};
|
||||
wasm-pack = callPackage ../development/tools/wasm-pack { };
|
||||
|
||||
wasynth = callPackage ../development/tools/wasynth { };
|
||||
|
||||
|
|
|
|||
|
|
@ -6123,6 +6123,8 @@ self: super: with self; {
|
|||
|
||||
matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { };
|
||||
|
||||
matplotx = callPackage ../development/python-modules/matplotx { };
|
||||
|
||||
matrix-api-async = callPackage ../development/python-modules/matrix-api-async { };
|
||||
|
||||
matrix-client = callPackage ../development/python-modules/matrix-client { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue