gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-14 12:06:23 +00:00
committed by GitHub
parent 818273776d df62369e9d
commit 81fb40d3aa
43 changed files with 1629 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/release-notes/rl-2411.section.md
+2
View File
@@ -115,6 +115,8 @@
- [Eintopf](https://eintopf.info), a community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf.enable).
- [`pay-respects`](https://codeberg.org/iff/pay-respects), a terminal command correction program, alternative to `thefuck`, written in Rust. Available as [programs.pay-respects](options.html#opt-programs.pay-respects).
- [Radicle](https://radicle.xyz), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable).
- [ddns-updater](https://github.com/qdm12/ddns-updater), a service with a WebUI to update DNS records periodically for many providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable).
nixos/modules/programs/pay-respects.nix
+56
View File
@@ -0,0 +1,56 @@
{
config,
pkgs,
lib,
...
}:
let
inherit (lib)
getExe
maintainers
mkEnableOption
mkIf
mkOption
types
;
inherit (types) str;
cfg = config.programs.pay-respects;
initScript =
shell:
if (shell != "fish") then
''
eval $(${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias})
''
else
''
${getExe pkgs.pay-respects} ${shell} --alias ${cfg.alias} | source
'';
in
{
options = {
programs.pay-respects = {
enable = mkEnableOption "pay-respects, an app which corrects your previous console command";
alias = mkOption {
default = "f";
type = str;
description = ''
`pay-respects` needs an alias to be configured.
The default value is `f`, but you can use anything else as well.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.pay-respects ];
programs = {
bash.interactiveShellInit = initScript "bash";
fish.interactiveShellInit = mkIf config.programs.fish.enable initScript "fish";
zsh.interactiveShellInit = mkIf config.programs.zsh.enable initScript "zsh";
};
};
meta.maintainers = with maintainers; [ sigmasquadron ];
}
pkgs/applications/audio/tree-from-tags/default.nix
-39
View File
@@ -1,39 +0,0 @@
{ lib, stdenv, bundlerEnv, ruby, fetchFromGitHub }:
let
version = "1.1";
gems = bundlerEnv {
name = "tree-from-tags-${version}-gems";
inherit ruby;
gemdir = ./.;
};
in stdenv.mkDerivation {
pname = "tree-from-tags";
inherit version;
src = fetchFromGitHub {
owner = "dbrock";
repo = "bongo";
rev = version;
sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv";
};
buildInputs = [ gems ruby ];
installPhase = ''
mkdir -p $out/{bin,share}
cp tree-from-tags.rb $out/share/
bin=$out/bin/tree-from-tags
# we are using bundle exec to start in the bundled environment
cat > $bin <<EOF
#!/bin/sh -e
exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@"
EOF
chmod +x $bin
'';
meta = with lib; {
description = "Create file hierarchies from media tags";
homepage = "https://www.emacswiki.org/emacs/Bongo";
platforms = ruby.meta.platforms;
maintainers = [ maintainers.livnev maintainers.dbrock ];
license = licenses.gpl2Plus;
mainProgram = "tree-from-tags";
};
}
pkgs/applications/editors/vim/plugins/generated.nix
+742 -741
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+173 -162
View File
@@ -16,12 +16,12 @@
};
agda = buildGrammar {
language = "agda";
version = "0.0.0+rev=6516cfe";
version = "0.0.0+rev=b9b32fa";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-agda";
rev = "6516cfec35479d62c0ad3c8e7e546a9774b489fd";
hash = "sha256-X8CkbeJWkNKyx1aT2FZRsh8teyie8nzZt7lhIQ+apnc=";
rev = "b9b32fa042c2952a7bfca86847ea325e44ccc897";
hash = "sha256-Goll4J6xrHO8YEuYoLR2rqy6lCMsr4JJbEs5C1jiX5Q=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda";
};
@@ -105,12 +105,12 @@
};
bash = buildGrammar {
language = "bash";
version = "0.0.0+rev=597a5ed";
version = "0.0.0+rev=49c3100";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
rev = "597a5ed6ed4d932fd44697feec988f977081ae59";
hash = "sha256-h6L5eIItu3IOJBKSZCajHMhhencN1Fk/4dXgBMuVxYc=";
rev = "49c31006d8307dcb12bc5770f35b6d5b9e2be68e";
hash = "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
};
@@ -193,23 +193,23 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=6c7f459";
version = "0.0.0+rev=e8841a6";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b";
hash = "sha256-lEaHOiA4BohmxOrcBy5TlV+x5aqD7e5n5beuVpqAM0M=";
rev = "e8841a6a9431b7365ac9055688429e1deb8db90f";
hash = "sha256-fFrIqiOgW+Aq4SbmevjLwooYeDOh0Odp0OJ/LkGDS04=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "0.0.0+rev=3a85187";
version = "0.0.0+rev=362a8a4";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "3a85187e0a9e8db01dec6b3eb2f4e7cdfecc9d88";
hash = "sha256-OwH0ehwTVEATJts7Y5k0E1oHL8X4G5DGoN4kZmhjjQk=";
rev = "362a8a41b265056592a0c3771664a21d23a71392";
hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@@ -325,23 +325,23 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=16bf9d2";
version = "0.0.0+rev=f41b4f6";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "16bf9d2c451957aee976c982c2c668b1c0d12014";
hash = "sha256-ZcZRTxF+9SvSwMSX4AjHndPJUnz3Ajx7/1cTkhWT7ZM=";
rev = "f41b4f66a42100be405f96bdc4ebc4a61095d3e8";
hash = "sha256-NRcyXjijLdoa5fdA+MKZyt7mnM5B37zCsqZh4QvuOtA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
css = buildGrammar {
language = "css";
version = "0.0.0+rev=ccc4e2c";
version = "0.0.0+rev=6a442a3";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-css";
rev = "ccc4e2c4b30ddabc4b41c577ad0550b3cac4a74a";
hash = "sha256-mtDBNG2vadcqYX6CHo9TBIg9vMvY1RmK0LiOD2su4JE=";
rev = "6a442a3cf461b0ce275339e5afa178693484c927";
hash = "sha256-+ZtJpxR+KlfrNHjpoCC5Il4aeYYvcB4Dtbs/BKxV60s=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
};
@@ -414,12 +414,12 @@
};
desktop = buildGrammar {
language = "desktop";
version = "0.0.0+rev=de93cdb";
version = "0.0.0+rev=d52964c";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-desktop";
rev = "de93cdbd1cba965c102ce8b659d79f5759b933bd";
hash = "sha256-aBdF9s1Km5vrb+kXnwdcxuhUJyzQCpGlQ/EE0h2kT0U=";
rev = "d52964c67d98eaedabca6ed1ec21ae54a522e8f8";
hash = "sha256-JF6xSMKj0tZ53t+65pk4P+Mn3ubbVczJGVDGGfqDiO4=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
};
@@ -513,24 +513,24 @@
};
dtd = buildGrammar {
language = "dtd";
version = "0.0.0+rev=cd1316e";
version = "0.0.0+rev=4b64dd3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c";
hash = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
rev = "4b64dd3a03ec002258d6268d712fd93716d6ab57";
hash = "sha256-/0IQsTkvFQOWnkLc2srjg2bn1sB1sNA6Sm3nwKGUDj4=";
};
location = "dtd";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
};
earthfile = buildGrammar {
language = "earthfile";
version = "0.0.0+rev=1d637f2";
version = "0.0.0+rev=059fb08";
src = fetchFromGitHub {
owner = "glehmann";
repo = "tree-sitter-earthfile";
rev = "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce";
hash = "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=";
rev = "059fb087247bef8789e938629388c3e7af32c986";
hash = "sha256-W3nGFisHK8V7F65cm7eyEgWa+qnjr75adFNz7GHfpPs=";
};
meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
};
@@ -548,12 +548,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=5eca41a";
version = "0.0.0+rev=cfdc59c";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "5eca41a689dc03534e9c459b066d116f8befb4ef";
hash = "sha256-bsefC7SCJvSPy83BeIYxmFe+0Zt96QNs49Tlh/Vbx5s=";
rev = "cfdc59ccdc13c324962a02e104743e0e23ca1010";
hash = "sha256-u62DJcDj3LJRklcj8zkfd/6goJItf0eIAdz1ekbM76E=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -625,12 +625,12 @@
};
embedded_template = buildGrammar {
language = "embedded_template";
version = "0.0.0+rev=7e319b0";
version = "0.0.0+rev=3322625";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-embedded-template";
rev = "7e319b065c5864bac2fb68f7e14a338b919e8bb3";
hash = "sha256-aBeJ0R2OQZTVH63NOGrYH0z044d0fgVgIn2V2Z2d7cY=";
rev = "332262529bc51abf5746317b2255ccc2fff778f8";
hash = "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
};
@@ -713,12 +713,12 @@
};
foam = buildGrammar {
language = "foam";
version = "0.0.0+rev=04664b4";
version = "0.0.0+rev=f08bb76";
src = fetchFromGitHub {
owner = "FoamScience";
repo = "tree-sitter-foam";
rev = "04664b40c0dadb7ef37028acf3422c63271d377b";
hash = "sha256-cIeYuYti/rzMivwRU//zzhMXJsTOMBveLK2zB4qRWGI=";
rev = "f08bb76892b93e5b23c45ac3bd6b1eea5df323cc";
hash = "sha256-boH5WJNwJmZKN4JCcFvVdAU06ZRj6Zdsq3NibSWjAr8=";
};
meta.homepage = "https://github.com/FoamScience/tree-sitter-foam";
};
@@ -857,12 +857,12 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
version = "0.0.0+rev=41940e1";
version = "0.0.0+rev=5425944";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "41940e199ba5763abea1d21b4f717014b45f01ea";
hash = "sha256-h9RPFI40C4LxjjKZEKkVCnUjNkh6Tgl74msSTpju7ZY=";
rev = "5425944fd61bf2b3bad2c17c2dc9f53172b0f01d";
hash = "sha256-X6M9/41xISnkDnXNgQAWexs68h8A0dwOz+aQa86H0pc=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
@@ -967,12 +967,12 @@
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=df2ce2e";
version = "0.0.0+rev=0942d76";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "df2ce2e206d2810bf010d73055055bfcff1b55aa";
hash = "sha256-hQrLPjGsgBDd3nMKSTEkcuV3dOK6b1FlAR1fD0mAAt0=";
rev = "0942d76fc517739b5d29a0e420b5e602d19c724d";
hash = "sha256-2j5cYuIn2gMFzNixijUcA9Ax2US8PEb/5VK44rjnZs4=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@@ -1121,12 +1121,12 @@
};
haskell = buildGrammar {
language = "haskell";
version = "0.0.0+rev=70ea075";
version = "0.0.0+rev=2c2fcb2";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "70ea0757986ea58a0d39ddfcd9d791beadeb0f43";
hash = "sha256-T/EMYPjdsD4hxcGzqYwC7uHP2EgWPYCqjPywucnpe9s=";
rev = "2c2fcb22e3b939ed59ae8d6f10500c3213c68670";
hash = "sha256-9yerJ3Cxfr1dU0GmWN9LiLjmdBpP8+fE1hDmP1oQHLI=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
};
@@ -1232,12 +1232,12 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=c30792d";
version = "0.0.0+rev=d9219ad";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "c30792dee70aaa1910e66a39557a841b6e4386d5";
hash = "sha256-DKRgTfJcUIOfuD7gFRGaSvLoz+RKhBVs0lVB22/AC04=";
rev = "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468";
hash = "sha256-0aLNG4eB2I0Qn0r1oF4YwUDLek78S5fbklFI/bMmxOQ=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@@ -1287,12 +1287,12 @@
};
idl = buildGrammar {
language = "idl";
version = "0.0.0+rev=9ac6fdd";
version = "0.0.0+rev=86ff7f1";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-idl";
rev = "9ac6fdd7840b5c0f271fe11b4ab656634dc2074a";
hash = "sha256-cedxIEfqyvnVdJOqPbXnsKoajMXwejVu9BV3qLCuYR8=";
rev = "86ff7f19747a761dc8ba72f4045fd64aed94ba4c";
hash = "sha256-8al6Tn27T6gj4FnBODsORJ4UGm+1aJD6Y09GmWfoP6Y=";
};
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
};
@@ -1309,12 +1309,12 @@
};
inko = buildGrammar {
language = "inko";
version = "0.0.0+rev=6f9c072";
version = "0.0.0+rev=aecabed";
src = fetchFromGitHub {
owner = "inko-lang";
repo = "tree-sitter-inko";
rev = "6f9c072d023c3886aabcd8012274461b35d2d0a9";
hash = "sha256-yZ4F5tREEgoiI7Q9MFVH9HIM6bYxb/qdd0lqZREZkIo=";
rev = "aecabede39b0db05678e2d4686258d4f71b00a51";
hash = "sha256-29vt7zf/prmbjPBJoItzJz2sOp40ySqiqtwlaBobjoQ=";
};
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
};
@@ -1342,23 +1342,23 @@
};
java = buildGrammar {
language = "java";
version = "0.0.0+rev=b864ed9";
version = "0.0.0+rev=a1bbe92";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9";
hash = "sha256-CiWIh8IFmK1xW7DfERWqsnFjtveAevANlzJbPOwA7Z0=";
rev = "a1bbe92a6370bb4c15386735fbda12f2b812a923";
hash = "sha256-AmGyKe7/zxzQTLSIQwiSuAJsYEcZVgW3RzfsRqyFNgE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
javascript = buildGrammar {
language = "javascript";
version = "0.0.0+rev=a2ef079";
version = "0.0.0+rev=108b2d4";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "a2ef0796e8b9db9107c9ad210b3121b8ad918d5e";
hash = "sha256-0WTH1bj2uKgfLnJqaoHYJFUFY4OWpCnY0YfbPiqIbiM=";
rev = "108b2d4d17a04356a340aea809e4dd5b801eb40d";
hash = "sha256-0x6DbmRTlxUP4vbWVsLoj+k1YOk2Dr+LAPClFsWi7r8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@@ -1375,23 +1375,23 @@
};
jsdoc = buildGrammar {
language = "jsdoc";
version = "0.0.0+rev=b223787";
version = "0.0.0+rev=b253abf";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-jsdoc";
rev = "b2237872e528b8372ed008068f717db66c16a725";
hash = "sha256-XRSwn1TZcotETTalWKAviBGmmQWHucfVFV7rqglTdfw=";
rev = "b253abf68a73217b7a52c0ec254f4b6a7bb86665";
hash = "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc";
};
json = buildGrammar {
language = "json";
version = "0.0.0+rev=f2503f1";
version = "0.0.0+rev=ee35a6e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "f2503f1c437fe24560876557868ac94c9cfd3216";
hash = "sha256-9tkKDvVB5YHqtIiBqrCRGp4H9MwapC1mHrm86iytiz4=";
rev = "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24";
hash = "sha256-DNZC2cTy1C8OaMOpEHM6NoRtOIbLaBf0CLXXWCKODlw=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
};
@@ -1430,12 +1430,12 @@
};
julia = buildGrammar {
language = "julia";
version = "0.0.0+rev=19f6265";
version = "0.0.0+rev=a8e1262";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "19f62656dc7f2ff3756a8ef3dcf9ab1c01a9eb58";
hash = "sha256-3oegMQ+8B/grgV26v9hir0vpjl9QYxj9cdLeIeDougw=";
rev = "a8e1262997d5a45520a06cbe1b86c0737d507054";
hash = "sha256-jwtMgHYSa9/kcsqyEUBrxC+U955zFZHVQ4N4iogiIHY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@@ -1518,12 +1518,12 @@
};
latex = buildGrammar {
language = "latex";
version = "0.0.0+rev=87e4059";
version = "0.0.0+rev=7b06f6e";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
rev = "87e4059f01bed363230dc349f794ce4cc580e862";
hash = "sha256-bUTJuwqdQ1htZQnxy3/fEm9zE7G5WDjiDib/iRteLTo=";
rev = "7b06f6ed394308e7407a1703d2724128c45fc9d7";
hash = "sha256-HbRjblLBExpBkBBjHyEHfnK0oootjAsqkwjmGH3/UYI=";
};
generate = true;
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
@@ -1730,12 +1730,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=8cde51a";
version = "0.0.0+rev=5b8867f";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "8cde51ac0484fdf59a90641fefb92a0e846dcc7c";
hash = "sha256-bIqWBIOkUq9TitqNneiB+epu/+kVgW1szOm96yMrFaE=";
rev = "5b8867f59954c9cae76f2aa1ac88ae513de412bd";
hash = "sha256-gbqXyIGlj7XnafqlGUaG0iPHRBabcni3pJxlehO70jg=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1819,12 +1819,12 @@
};
nix = buildGrammar {
language = "nix";
version = "0.0.0+rev=1b26cb6";
version = "0.0.0+rev=0240bbf";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "tree-sitter-nix";
rev = "1b26cb63284287344bc3820804cea18419b3edec";
hash = "sha256-tkGOSi0NqtKl6w473+G66mWwbXwpmRySMLH8DEEcEXQ=";
rev = "0240bbfce72d155823c3b7edec622dedd580bf02";
hash = "sha256-Z2h5YLdE6kGnYgX2QF3MQtOHC7sl/0ItJCucuXZRJCA=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
};
@@ -1852,12 +1852,12 @@
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=082a7c7";
version = "0.0.0+rev=7e0f16f";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "082a7c7df7db460da6b280c9f902bf2b19a2f423";
hash = "sha256-BUOadkcQAXqMI8qpDcPN8NwNI+LScPKl/GsGvhfUmhw=";
rev = "7e0f16f608a9e804fae61430ade734f9f849fb80";
hash = "sha256-BXG1kc76mkAkV6BLuCzshb+MQ/AxRrhEKcY/1utxmH4=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
@@ -1885,24 +1885,24 @@
};
ocaml = buildGrammar {
language = "ocaml";
version = "0.0.0+rev=5f7a97e";
version = "0.0.0+rev=26bc61c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e";
hash = "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A=";
rev = "26bc61c206e7820f9f804b206f7765ffc55cd039";
hash = "sha256-8pPgfvwp6h1tXo9fDwHtA7A8O6rjFzLb5eZfrkPxm+U=";
};
location = "grammars/ocaml";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocaml_interface = buildGrammar {
language = "ocaml_interface";
version = "0.0.0+rev=5f7a97e";
version = "0.0.0+rev=26bc61c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e";
hash = "sha256-jBWNJpLtBHJ13g4c30W6YqGN9O7UoX7iqvz7ThtHi5A=";
rev = "26bc61c206e7820f9f804b206f7765ffc55cd039";
hash = "sha256-8pPgfvwp6h1tXo9fDwHtA7A8O6rjFzLb5eZfrkPxm+U=";
};
location = "grammars/interface";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@@ -1987,24 +1987,24 @@
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=2bce5a6";
version = "0.0.0+rev=6918e69";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b";
hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU=";
rev = "6918e6908d78780ddd996b9fcbaa835b42782d5b";
hash = "sha256-U9OQNyjTKQVMLeiB/tNNA2hl7wug4q/pK22X4QRskk0=";
};
location = "php";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
php_only = buildGrammar {
language = "php_only";
version = "0.0.0+rev=2bce5a6";
version = "0.0.0+rev=6918e69";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b";
hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU=";
rev = "6918e6908d78780ddd996b9fcbaa835b42782d5b";
hash = "sha256-U9OQNyjTKQVMLeiB/tNNA2hl7wug4q/pK22X4QRskk0=";
};
location = "php_only";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@@ -2088,12 +2088,12 @@
};
printf = buildGrammar {
language = "printf";
version = "0.0.0+rev=94b84fb";
version = "0.0.0+rev=60d50a2";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-printf";
rev = "94b84fbc4768a7cbdeadfe5e489a45a6a8af400e";
hash = "sha256-Ax23Y2arS+8g45F1NuffTq0ZlPZ2NBz0aHuQJyEVy2Y=";
rev = "60d50a2247b0c1fb72b967562c64711d65c6a060";
hash = "sha256-Uf7HHHPIMpEFZdDF07tIwGeibxtzuDjLLFozKjawTEc=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf";
};
@@ -2145,12 +2145,12 @@
};
properties = buildGrammar {
language = "properties";
version = "0.0.0+rev=9d09f5f";
version = "0.0.0+rev=f93f673";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-properties";
rev = "9d09f5f200c356c50c4103d36441309fd61b48d1";
hash = "sha256-KrQlLqCH4P5pwm8ql+iVR09khzQuJu2UHXdMT9MZYe8=";
rev = "f93f673990deffbfa548826eebade93af81887b4";
hash = "sha256-XATT9i8lYcdTDtNHChtbUux9E6pg7jFPKnWR6tMEBew=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
};
@@ -2234,23 +2234,23 @@
};
python = buildGrammar {
language = "python";
version = "0.0.0+rev=7f4b9c2";
version = "0.0.0+rev=6d14e44";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "7f4b9c2d8039701b0579b7c060a918f8548aa7cd";
hash = "sha256-pD4JedYrnz6d5pgzRPtKPY0XPRoot1FMI9XgTgONOyw=";
rev = "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91";
hash = "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
};
ql = buildGrammar {
language = "ql";
version = "0.0.0+rev=1d3e2ff";
version = "0.0.0+rev=1fd627a";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ql";
rev = "1d3e2ff34f1113fadc0ff174c8a01cd4227af7fd";
hash = "sha256-nPOpe7p9dPEfJNmwYLsggwtY1RX/raWAMkcgbLJBIas=";
rev = "1fd627a4e8bff8c24c11987474bd33112bead857";
hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql";
};
@@ -2278,12 +2278,12 @@
};
query = buildGrammar {
language = "query";
version = "0.0.0+rev=f767fb0";
version = "0.0.0+rev=a6674e2";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "tree-sitter-query";
rev = "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0";
hash = "sha256-snr0ze1VCaAf448mHkrB9qbWTMvjSlPdVl2VtesMIHI=";
rev = "a6674e279b14958625d7a530cabe06119c7a1532";
hash = "sha256-xtr2IVI+3h/u9f84ye7szHR/U2E8Bm5NN7vhqaCkiyI=";
};
meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query";
};
@@ -2366,12 +2366,12 @@
};
regex = buildGrammar {
language = "regex";
version = "0.0.0+rev=b518ad4";
version = "0.0.0+rev=4470c59";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-regex";
rev = "b518ad4bbee3ad59672b1826ca4dc62825983533";
hash = "sha256-gApL+F03m24ibIrLMcirk1s+uJRM0vv7J34YRHkO78U=";
rev = "4470c59041416e8a2a9fa343595ca28ed91f38b8";
hash = "sha256-GNWntm8sgqVt6a+yFVncjkoMOe7CnXX9Qmpwy6KcFyU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
};
@@ -2476,34 +2476,45 @@
};
ruby = buildGrammar {
language = "ruby";
version = "0.0.0+rev=557ec01";
version = "0.0.0+rev=71bd32f";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "557ec01403bd1fcfea50f1805641ca773cbaaa42";
hash = "sha256-3MzlgYW65MSpukd8Nt9ooUC39g7ZigLjqXIaNB0sNEg=";
rev = "71bd32fb7607035768799732addba884a37a6210";
hash = "sha256-iu3MVJl0Qr/Ba+aOttmEzMiVY6EouGi5wGOx5ofROzA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
runescript = buildGrammar {
language = "runescript";
version = "0.0.0+rev=cf85bbd";
src = fetchFromGitHub {
owner = "2004Scape";
repo = "tree-sitter-runescript";
rev = "cf85bbd5da0c5ad243301d889c7f84d790a4cae4";
hash = "sha256-LRHTy5XMU2FOru7YrFlwuDU7brtnI/8RhAdQnY7Fkpk=";
};
meta.homepage = "https://github.com/2004Scape/tree-sitter-runescript";
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=2ace7a9";
version = "0.0.0+rev=32c17ce";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "2ace7a922a755960f44d73a7bb1efffeb4cc5501";
hash = "sha256-b4Qt61u1dJ3LCxVY1ulQjsZVt45BX5ZVa9nPD046yBI=";
rev = "32c17ce5463818032a9c252a849b910315b6e485";
hash = "sha256-ThsMUVCql0Z9ztMQDeLXR7gTWYY+uMGWuPvr3P8A/Hk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=a9af635";
version = "0.0.0+rev=28c3be0";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "a9af6356f8e31f04e870587bca79bc2b15808ff5";
hash = "sha256-nZUQh42OsPnQffixOklbAmAIGtct/AaKOn4fE6ndTfQ=";
rev = "28c3be045afe1e293b5ba1a74e759601e74050c3";
hash = "sha256-xJeimj4OJ2Fdqu2rA+FnCVvBo56qC9vreo7EOY4w3kc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@@ -2744,12 +2755,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=7d61ccc";
version = "0.0.0+rev=dbb0d1f";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "7d61cccdb865b2028301a0597b55ac8b225af6cf";
hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw=";
rev = "dbb0d1fc54f8525f41289a413ea6c0722e92bf9c";
hash = "sha256-c0JjQ3RZyKtP4ayDT9M+riYhK6JlMF/oVJfkfY17/7k=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2778,23 +2789,23 @@
};
sway = buildGrammar {
language = "sway";
version = "0.0.0+rev=03d97aa";
version = "0.0.0+rev=3950067";
src = fetchFromGitHub {
owner = "FuelLabs";
repo = "tree-sitter-sway";
rev = "03d97aad336ecc6b302f23bdd9b695ddc937160b";
hash = "sha256-Y08vgnlxOSjvI3NURU8VUyaGjKt+q4IiCaV18C5co0s=";
rev = "395006713db3bbb90d267ebdfcbf1881b399b05c";
hash = "sha256-5Js5WbpQAln6cfdjEd0emMtkC6uFGWA2LXQZkiXbap4=";
};
meta.homepage = "https://github.com/FuelLabs/tree-sitter-sway.git";
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=5098007";
version = "0.0.0+rev=6accc2f";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "5098007f58f4663a5613b2fecb6b866e3d41e37b";
hash = "sha256-VIBjnR9pkPt9RWjaDBWv6Rhuzr8eTjNJtrfXI/+2mCs=";
rev = "6accc2f720c7ff8573f6956a34ea22f50c44d839";
hash = "sha256-SFzOo7Nx7kjQ69KUIH9raGj4zYYI0HPeagECAZJGfww=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2823,12 +2834,12 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=e455373";
version = "0.0.0+rev=476f0d8";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "e455373021812abf4a0b5170caa0d882a9578bab";
hash = "sha256-SJYT34qw55xiN0lJ37NfPkV4WHi7/5Ymdxruk4vyOV4=";
rev = "476f0d8ab4b012d3b6f9598890217ada70f1a8ba";
hash = "sha256-zyMThhLjjiL/wtz5DGmjbfGTfcIj4JNSVCKfBIEw/0w=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@@ -2856,12 +2867,12 @@
};
tcl = buildGrammar {
language = "tcl";
version = "0.0.0+rev=cdba4ab";
version = "0.0.0+rev=98015eb";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-tcl";
rev = "cdba4ab96a9896492d0d5219b70300c8783ca4e7";
hash = "sha256-NEaB52q2GEEy25JMZwbbyE1Aj4UkO17K9KBB2KqmVHQ=";
rev = "98015ebe182d94e5a4439e32ffd91beaac32fcb9";
hash = "sha256-zpswRch3xYjymQhc69noDTCsPrFzVRm1RN3jjIrUeDE=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl";
};
@@ -2879,12 +2890,12 @@
};
templ = buildGrammar {
language = "templ";
version = "0.0.0+rev=1dcd7db";
version = "0.0.0+rev=73a5587";
src = fetchFromGitHub {
owner = "vrischmann";
repo = "tree-sitter-templ";
rev = "1dcd7db19c047bc0327907a544df3207ba814ea4";
hash = "sha256-/WOEN+FGb65IpRZCzB2+0/aTjourcL5CYchrZxwlFWs=";
rev = "73a558744fff7c4560f4801e14a467811f608556";
hash = "sha256-Wdu3CtjITuRUFmq3FfDZKIKE9t9vYMFv+CG5J0BBYGU=";
};
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
};
@@ -2991,12 +3002,12 @@
};
tsx = buildGrammar {
language = "tsx";
version = "0.0.0+rev=73c4447";
version = "0.0.0+rev=45af495";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "73c4447796b251295b498227bad028d88dc1918b";
hash = "sha256-tF1fdxM9xsAk2pF3ptzyLy8/76uZ5Vs+jACK4dlmbak=";
rev = "45af49560396d67a710b21a3ce315fcaa09006ff";
hash = "sha256-15TAkZeoHTQvPqswlP8dFMyt8F/ztozaJtZys49rzeM=";
};
location = "tsx";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -3025,12 +3036,12 @@
};
typescript = buildGrammar {
language = "typescript";
version = "0.0.0+rev=73c4447";
version = "0.0.0+rev=45af495";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "73c4447796b251295b498227bad028d88dc1918b";
hash = "sha256-tF1fdxM9xsAk2pF3ptzyLy8/76uZ5Vs+jACK4dlmbak=";
rev = "45af49560396d67a710b21a3ce315fcaa09006ff";
hash = "sha256-15TAkZeoHTQvPqswlP8dFMyt8F/ztozaJtZys49rzeM=";
};
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -3070,12 +3081,12 @@
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=8f58696";
version = "0.0.0+rev=18a1d18";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-udev";
rev = "8f58696e79092b4ad6bf197415bbd0970acf15cd";
hash = "sha256-4vkEHlK8r69cvSu7CAXOmyiSSuIRlZcnQAGHtWqx41w=";
rev = "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc";
hash = "sha256-ySo+vS+il1tmTPZ6OJMduyJxsjjI3eIkYSMYs10Bcnk=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev";
};
@@ -3092,12 +3103,12 @@
};
unison = buildGrammar {
language = "unison";
version = "0.0.0+rev=bc06e1e";
version = "0.0.0+rev=3c97db7";
src = fetchFromGitHub {
owner = "kylegoetz";
repo = "tree-sitter-unison";
rev = "bc06e1eb100e1c0fab9bd89a9ca55d646ac80fc4";
hash = "sha256-NbsUvRkFRd/khn37qYmPvq9ynzFvnr1zhwh8zPDIjxE=";
rev = "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9";
hash = "sha256-xveOQpCCkYdeiPkRbFlPNfXOpWW0lzCxfQbxXz+eurM=";
};
generate = true;
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
@@ -3126,12 +3137,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=ea53875";
version = "0.0.0+rev=8f1a06b";
src = fetchFromGitHub {
owner = "vlang";
repo = "v-analyzer";
rev = "ea538758a1273b59774dc9179cde460d9c73fd89";
hash = "sha256-r2Mn7hvMjMYp+jvceGHNT0ss4UzoOjLeqN+DFj/mB0U=";
rev = "8f1a06b488e65aeeb340d5e2ae3e703a104bd5c4";
hash = "sha256-ZpwEA9lH5IiqBjlEXY7fMGHWwhq428la1CdqkcJRTeQ=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -3171,12 +3182,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=606cc72";
version = "0.0.0+rev=b4e73e0";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "606cc728e7d55bbcecfa37b20d7313a609af1361";
hash = "sha256-H8BApOAcRIFNI5Ke8DtCDZUDptKNeS8wTMHQp6xZZBM=";
rev = "b4e73e0c0a09af83e10145953cfbd3652c2833dc";
hash = "sha256-R6XPzqNkACKEMSz9Ni2Ic5aHyZ7bcp69z2cmOQCah/s=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3292,24 +3303,24 @@
};
xml = buildGrammar {
language = "xml";
version = "0.0.0+rev=cd1316e";
version = "0.0.0+rev=4b64dd3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c";
hash = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
rev = "4b64dd3a03ec002258d6268d712fd93716d6ab57";
hash = "sha256-/0IQsTkvFQOWnkLc2srjg2bn1sB1sNA6Sm3nwKGUDj4=";
};
location = "xml";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=d36d356";
version = "0.0.0+rev=a75056c";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "d36d356624af4b46d3fc815d0701ebf72654473c";
hash = "sha256-h3rS89e+eZTCxCNJVJdBbgCFEMDXQ884Lkmol0Gcq5k=";
rev = "a75056c2e1bed83c338ff394dbb7c653db210432";
hash = "sha256-lGQYY0hlOc7qp2MgNfCKPizDl8XOTbWraEw02xJVMcg=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
pkgs/applications/editors/vim/plugins/overrides.nix
+1 -1
View File
@@ -173,7 +173,7 @@ in
pname = "avante-nvim-lib";
inherit (oldAttrs) version src;
cargoHash = "sha256-X8JqUoPjm9emJjmwCh7+0bfdtPXLwOg6IRfQHaYlH90=";
cargoHash = "sha256-HPObCCaGMFu+7+zK9sg7hFlTb1CNQ9AV6V1r0WKRSZo=";
nativeBuildInputs = [
pkg-config
pkgs/applications/editors/vim/plugins/vim-plugin-names
+16 -16
View File
@@ -116,10 +116,9 @@ https://github.com/AndrewRadev/bufferize.vim/,HEAD,
https://github.com/akinsho/bufferline.nvim/,,
https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
https://github.com/bullets-vim/bullets.vim/,,
https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
https://github.com/itchyny/calendar.vim/,,
https://github.com/bkad/camelcasemotion/,,
https://github.com/catppuccin/nvim/,,catppuccin-nvim
https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
https://github.com/tyru/caw.vim/,,
https://github.com/uga-rosa/ccc.nvim/,HEAD,
https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
@@ -300,7 +299,6 @@ https://github.com/direnv/direnv.vim/,,
https://github.com/chipsenkbeil/distant.nvim/,HEAD,
https://github.com/doki-theme/doki-theme-vim/,,
https://github.com/NTBBloodbath/doom-one.nvim/,,
https://github.com/dracula/vim/,,dracula-vim
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
https://github.com/Bekaboo/dropbar.nvim/,HEAD,
@@ -315,7 +313,6 @@ https://github.com/creativenull/efmls-configs-nvim/,,
https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
https://github.com/elmcast/elm-vim/,,
https://github.com/dmix/elvish.vim/,,
https://github.com/embark-theme/vim/,,embark-vim
https://github.com/mattn/emmet-vim/,,
https://github.com/vim-scripts/emodeline/,,
https://github.com/vim-scripts/errormarker.vim/,,
@@ -364,7 +361,6 @@ https://github.com/gfanto/fzf-lsp.nvim/,,
https://github.com/ibhagwan/fzf-lua/,HEAD,
https://github.com/junegunn/fzf.vim/,,
https://github.com/NTBBloodbath/galaxyline.nvim/,,
https://github.com/gbprod/nord.nvim/,,gbprod-nord
https://github.com/jsfaint/gen_tags.vim/,,
https://github.com/gentoo/gentoo-syntax/,,
https://github.com/ndmitchell/ghcid/,,
@@ -394,8 +390,8 @@ https://github.com/cbochs/grapple.nvim/,HEAD,
https://github.com/blazkowolf/gruber-darker.nvim/,,
https://github.com/MagicDuck/grug-far.nvim/,,
https://github.com/morhetz/gruvbox/,,
https://github.com/luisiacc/gruvbox-baby/,HEAD,
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
https://github.com/luisiacc/gruvbox-baby/,HEAD,
https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
https://github.com/sainnhe/gruvbox-material/,,
https://github.com/f4z3r/gruvbox-material.nvim/,HEAD,
@@ -438,6 +434,7 @@ https://github.com/idris-hackers/idris-vim/,,
https://github.com/ShinKage/idris2-nvim/,,
https://github.com/edwinb/idris2-vim/,,
https://github.com/3rd/image.nvim/,HEAD,
https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
https://github.com/lewis6991/impatient.nvim/,,
https://github.com/backdround/improved-search.nvim/,HEAD,
@@ -546,7 +543,6 @@ https://github.com/williamboman/mason.nvim/,HEAD,
https://github.com/vim-scripts/matchit.zip/,,
https://github.com/marko-cerovac/material.nvim/,,
https://github.com/kaicataldo/material.vim/,HEAD,
https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
https://github.com/vim-scripts/mayansmoke/,,
https://github.com/chikamichi/mediawiki.vim/,HEAD,
https://github.com/savq/melange-nvim/,,
@@ -605,6 +601,7 @@ https://github.com/miikanissi/modus-themes.nvim/,HEAD,
https://github.com/tomasr/molokai/,,
https://github.com/benlubas/molten-nvim/,HEAD,
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD,
https://github.com/yegappan/mru/,,
https://github.com/smoka7/multicursors.nvim/,HEAD,
@@ -675,6 +672,7 @@ https://github.com/stevanmilic/neotest-scala/,HEAD,
https://github.com/shunsambongi/neotest-testthat/,HEAD,
https://github.com/marilari88/neotest-vitest/,HEAD,
https://github.com/lawrence-laz/neotest-zig/,HEAD,
https://github.com/rose-pine/neovim/,main,rose-pine
https://github.com/Shatur/neovim-ayu/,,
https://github.com/cloudhead/neovim-fuzzy/,,
https://github.com/jeffkreeftmeijer/neovim-sensible/,,
@@ -689,7 +687,6 @@ https://github.com/fiatjaf/neuron.vim/,,
https://github.com/Olical/nfnl/,main,
https://github.com/chr4/nginx.vim/,,
https://github.com/oxfist/night-owl.nvim/,,
https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/Alexis12119/nightly.nvim/,,
https://github.com/zah/nim.vim/,,
@@ -701,7 +698,7 @@ https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/kartikp10/noctis.nvim/,,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/nvimtools/none-ls.nvim/,HEAD,
https://github.com/nordtheme/vim/,,nord-vim
https://github.com/gbprod/nord.nvim/,,gbprod-nord
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
@@ -710,8 +707,8 @@ https://github.com/MunifTanjim/nui.nvim/,main,
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
https://github.com/nacro90/numb.nvim/,,
https://github.com/nvchad/nvchad/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
https://github.com/catppuccin/nvim/,,catppuccin-nvim
https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
https://github.com/windwp/nvim-autopairs/,,
@@ -857,7 +854,6 @@ https://github.com/olimorris/persisted.nvim/,HEAD,
https://github.com/folke/persistence.nvim/,,
https://github.com/pest-parser/pest.vim/,HEAD,
https://github.com/lifepillar/pgsql.vim/,,
https://github.com/phha/zenburn.nvim/,,phha-zenburn
https://github.com/motus/pig.vim/,,
https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
https://github.com/aklt/plantuml-syntax/,,
@@ -877,7 +873,6 @@ https://github.com/ahmedkhalf/project.nvim/,,
https://github.com/kevinhwang91/promise-async/,HEAD,
https://github.com/frigoeu/psc-ide-vim/,,
https://github.com/Shougo/pum.vim/,HEAD,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/purescript-contrib/purescript-vim/,,
https://github.com/python-mode/python-mode/,,
https://github.com/vim-python/python-syntax/,,
@@ -910,7 +905,6 @@ https://github.com/gu-fan/riv.vim/,,
https://github.com/kevinhwang91/rnvimr/,,
https://github.com/mfukar/robotframework-vim/,,
https://github.com/ron-rs/ron.vim/,,
https://github.com/rose-pine/neovim/,main,rose-pine
https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
https://github.com/keith/rspec.vim/,,
https://github.com/ccarpita/rtorrent-syntax-file/,,
@@ -918,7 +912,6 @@ https://github.com/simrat39/rust-tools.nvim/,,
https://github.com/rust-lang/rust.vim/,,
https://github.com/hauleth/sad.vim/,,
https://github.com/vmware-archive/salt-vim/,,
https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
https://github.com/lewis6991/satellite.nvim/,HEAD,
https://github.com/davidgranstrom/scnvim/,HEAD,
https://github.com/tiagovla/scope.nvim/,HEAD,
@@ -1075,6 +1068,7 @@ https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD,
https://github.com/chomosuke/typst-preview.nvim/,HEAD,
https://github.com/kaarmu/typst.vim/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,,
@@ -1090,6 +1084,11 @@ https://github.com/junegunn/vader.vim/,,
https://github.com/jbyuki/venn.nvim/,,
https://github.com/vhda/verilog_systemverilog.vim/,,
https://github.com/vifm/vifm.vim/,,
https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
https://github.com/dracula/vim/,,dracula-vim
https://github.com/embark-theme/vim/,,embark-vim
https://github.com/nordtheme/vim/,,nord-vim
https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
https://github.com/Konfekt/vim-CtrlXA/,,
https://github.com/konfekt/vim-DetectSpellLang/,,
https://github.com/dpelle/vim-LanguageTool/,,
@@ -1116,7 +1115,6 @@ https://github.com/MarcWeber/vim-addon-sql/,,
https://github.com/MarcWeber/vim-addon-syntax-checker/,,
https://github.com/MarcWeber/vim-addon-toggle-buffer/,,
https://github.com/MarcWeber/vim-addon-xdebug/,,
https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
https://github.com/junegunn/vim-after-object/,,
https://github.com/danilo-augusto/vim-afterglow/,HEAD,
https://github.com/msuperdock/vim-agda/,HEAD,
@@ -1193,7 +1191,6 @@ https://github.com/kristijanhusak/vim-dirvish-git/,,
https://github.com/tpope/vim-dispatch/,,
https://github.com/radenling/vim-dispatch-neovim/,,
https://github.com/jhradilek/vim-docbk/,,
https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
https://github.com/tpope/vim-dotenv/,,
https://github.com/junegunn/vim-easy-align/,,
https://github.com/zhou13/vim-easyescape/,,
@@ -1347,6 +1344,7 @@ https://github.com/jistr/vim-nerdtree-tabs/,,
https://github.com/nfnty/vim-nftables/,,
https://github.com/kana/vim-niceblock/,,
https://github.com/nickel-lang/vim-nickel/,main,
https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/tommcdo/vim-ninja-feet/,,
https://github.com/LnL7/vim-nix/,,
https://github.com/symphorien/vim-nixhash/,,
@@ -1437,6 +1435,7 @@ https://github.com/psliwka/vim-smoothie/,,
https://github.com/bohlender/vim-smt2/,,
https://github.com/justinmk/vim-sneak/,,
https://github.com/garbas/vim-snipmate/,,
https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
https://github.com/honza/vim-snippets/,,
https://github.com/lifepillar/vim-solarized8/,HEAD,
https://github.com/tomlion/vim-solidity/,,
@@ -1566,6 +1565,7 @@ https://github.com/Lilja/zellij.nvim/,HEAD,
https://github.com/folke/zen-mode.nvim/,,
https://github.com/zenbones-theme/zenbones.nvim/,HEAD,
https://github.com/jnurmine/zenburn/,,
https://github.com/phha/zenburn.nvim/,,phha-zenburn
https://github.com/nvimdev/zephyr-nvim/,,
https://github.com/ziglang/zig.vim/,,
https://github.com/zk-org/zk-nvim/,HEAD,
pkgs/by-name/al/allmark/0001-Add-go.mod-go.sum.patch
+86
View File
@@ -0,0 +1,86 @@
From b68287d3770fd1d2ba2c83a0de6b9b9bc550bee2 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 2 Nov 2024 18:17:20 +0800
Subject: [PATCH] Add go.mod & go.sum; remove vendor
---
go.mod | 27 +++++++++++++++++++++++++++
go.sum | 32 ++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 go.mod
create mode 100644 go.sum
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..21b33b1
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,27 @@
+module github.com/andreaskoch/allmark
+
+go 1.19
+
+require (
+ github.com/abbot/go-http-auth v0.4.0
+ github.com/andreaskoch/fulltext v0.0.0-20150721192424-05ab8b1eab52
+ github.com/andreaskoch/go-fswatch v1.0.0
+ github.com/gorilla/handlers v1.5.2
+ github.com/gorilla/mux v1.8.1
+ github.com/kyokomi/emoji v1.5.1
+ github.com/mitchellh/go-homedir v1.1.0
+ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
+ github.com/russross/blackfriday v1.6.0
+ github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
+ github.com/spf13/afero v1.11.0
+ golang.org/x/net v0.26.0
+)
+
+require (
+ github.com/felixge/httpsnoop v1.0.3 // indirect
+ github.com/jbarham/go-cdb v0.0.0-20200301055225-9d6f6caadef0 // indirect
+ golang.org/x/crypto v0.24.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
+)
+
+replace github.com/jbarham/go-cdb => github.com/jbarham/cdb v0.0.0-20200301055225-9d6f6caadef0
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..0dc9e58
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,32 @@
+github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0EVT0=
+github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM=
+github.com/andreaskoch/fulltext v0.0.0-20150721192424-05ab8b1eab52 h1:Qp0ffUn2ZJsi5GXcE89Hk6QuZnSfFfgxm1+zzSJ45ak=
+github.com/andreaskoch/fulltext v0.0.0-20150721192424-05ab8b1eab52/go.mod h1:zETSTZmtSh/XxEkD4vIlbf1Ih/gKC+10kcpBO6mv3iE=
+github.com/andreaskoch/go-fswatch v1.0.0 h1:la8nP/HiaFCxP2IM6NZNUCoxgLWuyNFgH0RligBbnJU=
+github.com/andreaskoch/go-fswatch v1.0.0/go.mod h1:r5/iV+4jfwoY2sYqBkg8vpF04ehOvEl4qPptVGdxmqo=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
+github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/jbarham/cdb v0.0.0-20200301055225-9d6f6caadef0 h1:UfCOnKxwt2dxueylTrrjjyMsaXPHTSJJygePRYaRntE=
+github.com/jbarham/cdb v0.0.0-20200301055225-9d6f6caadef0/go.mod h1:ColEidrii1lqlFhoEckJfZsa0mWxC0I2+f7G/5hZWsw=
+github.com/kyokomi/emoji v1.5.1 h1:qp9dub1mW7C4MlvoRENH6EAENb9skEFOvIEbp1Waj38=
+github.com/kyokomi/emoji v1.5.1/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
+github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
+github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
--
2.46.1
pkgs/by-name/al/allmark/package.nix
+9 -5
View File
@@ -10,21 +10,25 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "andreaskoch";
repo = pname;
repo = "allmark";
rev = "v${version}";
hash = "sha256-JfNn/e+cSq1pkeXs7A2dMsyhwOnh7x2bwm6dv6NOjLU=";
};
postPatch = ''
go mod init github.com/andreaskoch/allmark
'';
vendorHash = "sha256-dEmI+COrWhXdqtTkLIjyiUapHtjezCEuY9jLDqxkBBg=";
vendorHash = null;
deleteVendor = true;
patches = [
./0001-Add-go.mod-go.sum.patch # Add go.mod, go.sum, remove vendor
];
postInstall = ''
mv $out/bin/{cli,allmark}
'';
__darwinAllowLocalNetworking = true;
meta = {
description = "Cross-platform markdown web server";
homepage = "https://github.com/andreaskoch/allmark";
pkgs/by-name/ba/basedpyright/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
buildNpmPackage rec {
pname = "basedpyright";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
hash = "sha256-OQXqwpvYIitWGWshEv1/j2hAphFnGXDuvbRav5TilI4=";
hash = "sha256-RwckZqEL5U60XSYul74p9Ezg+N8FrnLkRFpdxIa7/34=";
};
npmDepsHash = "sha256-hCZ68sLpQs/7SYVf3pMAHfstRm1C/d80j8fESIFdhnw=";
pkgs/by-name/fr/fritz-exporter/package.nix
+3 -3
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "fritz-exporter";
version = "2.5.0";
version = "2.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pdreker";
repo = "fritz_exporter";
rev = "fritzexporter-v${version}";
hash = "sha256-x5WCVDIKdreQCmVpiWbmVBNo42P5kSxX9dLMBKfZTWc=";
rev = "refs/tags/fritzexporter-v${version}";
hash = "sha256-qqvvoOQRFNl9IUjaBc/qzg9AevT5c2JDsfDVAZW6d6E=";
};
postPatch = ''
pkgs/by-name/hy/hyprwall/package.nix
+54
View File
@@ -0,0 +1,54 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
glib,
pango,
gtk3,
wrapGAppsHook4,
}:
rustPlatform.buildRustPackage rec {
pname = "hyprwall";
version = "0.1.8";
src = fetchFromGitHub {
owner = "hyprutils";
repo = "hyprwall";
rev = "refs/tags/v${version}";
hash = "sha256-dzPd+5cws3hKhdd1CKKEO7EWMS0XW0y1vqxg1XKX+gY=";
};
cargoHash = "sha256-gT2ysWHckcUl1yx5tciy6kSvZZ0srrs4OwI1mr/58Pc=";
nativeBuildInputs = [
pkg-config
glib
pango
wrapGAppsHook4
];
# Required in build process, prevents gdk-sys build error.
buildInputs = [
gtk3
];
postInstall = ''
install -Dm644 hyprwall.desktop -t $out/share/applications
install -Dm644 hyprwall.png -t $out/share/pixmaps
substituteInPlace "$out/share/applications/hyprwall.desktop" \
--replace-fail 'Exec=/usr/bin/hyprwall' "Exec=hyprwall"
'';
meta = {
description = "GUI for setting wallpapers with hyprpaper";
homepage = "https://github.com/hyprutils/hyprwall";
changelog = "https://github.com/hyprutils/hyprwall/releases/tag/v${version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "hyprwall";
platforms = lib.platforms.linux;
};
}
pkgs/by-name/nc/ncspot/package.nix
+2 -2
View File
@@ -2,8 +2,8 @@
lib,
stdenv,
alsa-lib,
apple-sdk_11,
config,
darwin,
dbus,
fetchFromGitHub,
libpulseaudio,
@@ -50,8 +50,8 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ ncurses ]
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
++ lib.optional stdenv.hostPlatform.isLinux openssl
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa
++ lib.optional (withALSA || withRodio) alsa-lib
++ lib.optional withClipboard libxcb
++ lib.optional withCover ueberzug
pkgs/by-name/pa/pay-respects/package.nix
+27
View File
@@ -0,0 +1,27 @@
{
lib,
fetchFromGitea,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "pay-respects";
version = "0.4.18";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "iff";
repo = "pay-respects";
rev = "v${version}";
hash = "sha256-8YQgNOqZAMhn93rk0fw1SV02XhI/Wt9D5Rzo64cCs7s=";
};
cargoHash = "sha256-xLAJLwzX923E7Pzfwdw38moLOlY0Q4xK8himbKHQ7O8=";
meta = {
description = "Terminal command correction, alternative to `thefuck`, written in Rust";
homepage = "https://codeberg.org/iff/pay-respects";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ sigmasquadron ];
mainProgram = "pay-respects";
};
}
pkgs/by-name/qt/qtscrcpy/package.nix
+132
View File
@@ -0,0 +1,132 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
libsForQt5,
scrcpy,
android-tools,
ffmpeg_4,
makeDesktopItem,
copyDesktopItems,
}:
stdenv.mkDerivation rec {
pname = "qtscrcpy";
version = "2.2.1";
src =
(fetchFromGitHub {
owner = "barry-ran";
repo = "QtScrcpy";
rev = "refs/tags/v${version}";
hash = "sha256-PL/UvRNqvLaFuvSHbkJsaJ2nqRp5+ERM+rmlKVtbShk=";
fetchSubmodules = true;
}).overrideAttrs
(_: {
GIT_CONFIG_COUNT = 1;
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
GIT_CONFIG_VALUE_0 = "git@github.com:";
});
patches = [
# remove vendored ffmpeg, adb and scrcpy-server
./remove_vendors.patch
# remove predefined adb and scrcpy-server path
# we later set them in wrapper
./remove_predefined_paths.patch
];
postPatch = ''
substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \
--replace-fail 'serverVersion = "2.1.1"' 'serverVersion = "${scrcpy.version}"'
substituteInPlace QtScrcpy/util/config.cpp \
--replace-fail 'COMMON_SERVER_VERSION_DEF "2.1.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
substituteInPlace QtScrcpy/audio/audiooutput.cpp \
--replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh"
substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \
--replace-fail 'ADB=./adb' "ADB=${lib.getExe' android-tools "adb"}" \
--replace-fail 'SNDCPY_APK=sndcpy.apk' "SNDCPY_APK=$out/share/qtscrcpy/sndcpy.apk"
'';
nativeBuildInputs = [
cmake
pkg-config
libsForQt5.wrapQtAppsHook
copyDesktopItems
];
buildInputs =
[
scrcpy
ffmpeg_4
]
++ (with libsForQt5; [
qtbase
qtmultimedia
qtx11extras
]);
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=sign-compare"
];
# Doesn't contain rule to install
installPhase = ''
runHook preInstall
pushd ../output/x64/Release
install -Dm755 QtScrcpy -t $out/bin
install -Dm755 sndcpy.sh -t $out/share/qtscrcpy
install -Dm644 sndcpy.apk -t $out/share/qtscrcpy
popd
install -Dm644 ../QtScrcpy/res/image/tray/logo.png $out/share/pixmaps/qtscrcpy.png
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "QtScrcpy";
exec = "QtScrcpy %U";
icon = "qtscrcpy";
desktopName = "QtScrcpy";
genericName = "Android Display Control";
categories = [
"Utility"
"RemoteAccess"
];
})
];
preFixup = ''
qtWrapperArgs+=(
--set QTSCRCPY_ADB_PATH ${lib.getExe' android-tools "adb"}
--set QTSCRCPY_SERVER_PATH ${scrcpy}/share/scrcpy/scrcpy-server
)
'';
meta = {
description = "Android real-time display control software";
homepage = "https://github.com/barry-ran/QtScrcpy";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
daru-san
aleksana
];
mainProgram = "QtScrcpy";
platforms = with lib.platforms; linux ++ darwin ++ windows;
# needs some special handling on darwin as it generates .app bundle directly
badPlatforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [
fromSource
# Still includes sndcpy.apk vendored in the same repo
# which will run on controlled Android device
# https://github.com/barry-ran/QtScrcpy/blob/master/QtScrcpy/sndcpy/sndcpy.apk
binaryBytecode
];
};
}
pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch
+27
View File
@@ -0,0 +1,27 @@
diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp
index a24ba60..51e3d76 100644
--- a/QtScrcpy/main.cpp
+++ b/QtScrcpy/main.cpp
@@ -22,22 +22,16 @@ int main(int argc, char *argv[])
{
// set env
#ifdef Q_OS_WIN32
- qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/win/adb.exe");
- qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
#endif
#ifdef Q_OS_OSX
- qputenv("QTSCRCPY_ADB_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb");
- qputenv("QTSCRCPY_SERVER_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../../../../config");
#endif
#ifdef Q_OS_LINUX
- qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb");
- qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
#endif
pkgs/by-name/qt/qtscrcpy/remove_vendors.patch
+96
View File
@@ -0,0 +1,96 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85c733e..02fea2c 100644
--- a/QtScrcpy/QtScrcpyCore/CMakeLists.txt
+++ b/QtScrcpy/QtScrcpyCore/CMakeLists.txt
@@ -139,87 +139,10 @@ target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DI
target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/device/recorder)
target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/devicemanage)
-#
-# plantform deps
-#
-# windows
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- # ffmpeg
- # include
- target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include)
- # link
- set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/${QSC_CPU_ARCH}")
- target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH})
- target_link_libraries(${QSC_PROJECT_NAME} PRIVATE
- avformat
- avcodec
- avutil
- swscale
- )
- # copy
- set(THIRD_PARTY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party")
- set(FFMPEG_BIN_PATH "${THIRD_PARTY_PATH}/ffmpeg/bin/${QSC_CPU_ARCH}")
- add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/avcodec-58.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/avformat-58.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/avutil-56.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/swscale-5.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/swresample-3.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${THIRD_PARTY_PATH}/adb/win/adb.exe" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${THIRD_PARTY_PATH}/adb/win/AdbWinApi.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${THIRD_PARTY_PATH}/adb/win/AdbWinUsbApi.dll" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${THIRD_PARTY_PATH}/scrcpy-server" "${QSC_DEPLOY_PATH}"
- )
-endif()
-# MacOS
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- # ffmpeg
- # include
- target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include)
- # link
- set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib")
- target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH})
- target_link_libraries(${QSC_PROJECT_NAME} PRIVATE
- avformat.58
- avcodec.58
- avutil.56
- swscale.5
- )
-
- # copy bundle file
- add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD
- # dylib,scrcpy-server,adb copy to Contents/MacOS
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS"
-
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS"
- )
-endif()
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswscale)
-# Linux
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # include
- target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include)
- # link
- set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib")
- target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH})
- target_link_libraries(${QSC_PROJECT_NAME} PRIVATE
- # ffmpeg
- avformat
- avcodec
- avutil
- swscale
- z
- )
-
- add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/linux/adb" "${QSC_DEPLOY_PATH}"
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}"
- )
-endif()
+target_link_libraries(${QSC_PROJECT_NAME} PRIVATE ${FFMPEG_LIBRARIES})
+target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${FFMPEG_INCLUDE_DIRS})
pkgs/by-name/ra/rabbit/package.nix
+2
View File
@@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec {
"scikit-learn"
"scipy"
"tqdm"
"pandas"
"urllib3"
];
build-system = [
pkgs/by-name/st/step-cli/package.nix
+6 -1
View File
@@ -16,7 +16,12 @@ buildGoModule {
owner = "smallstep";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-Ha64SLJWJdfVt1T2M6UHyFD/OD8lmUQ0vU8OKjN272Y=";
hash = "sha256-G+/fc1qFXcNOxF+oyDmEZzzOUcODBvX+YfQ8Sx5JQK4=";
# this file change depending on git branch status (via .gitattributes)
# https://github.com/NixOS/nixpkgs/issues/84312
postFetch = ''
rm -f $out/.VERSION
'';
};
ldflags = [
pkgs/applications/audio/tree-from-tags/Gemfile → pkgs/by-name/tr/tree-from-tags/Gemfile
View File
pkgs/applications/audio/tree-from-tags/Gemfile.lock → pkgs/by-name/tr/tree-from-tags/Gemfile.lock
View File
pkgs/applications/audio/tree-from-tags/gemset.nix → pkgs/by-name/tr/tree-from-tags/gemset.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{
taglib-ruby = {
source = {
remotes = ["https://rubygems.org"];
remotes = [ "https://rubygems.org" ];
sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
type = "gem";
};
pkgs/by-name/tr/tree-from-tags/package.nix
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
bundlerEnv,
ruby,
fetchFromGitHub,
}:
let
version = "1.1";
gems = bundlerEnv {
name = "tree-from-tags-${version}-gems";
inherit ruby;
gemdir = ./.;
};
in
stdenv.mkDerivation {
pname = "tree-from-tags";
inherit version;
src = fetchFromGitHub {
owner = "dbrock";
repo = "bongo";
rev = version;
hash = "sha256-G+6rRJLNBECxGc8WuaesXhrYqvEDy2Chpw4lWxO8X9s=";
};
buildInputs = [
gems
ruby
];
installPhase = ''
mkdir -p $out/{bin,share}
cp tree-from-tags.rb $out/share/
bin=$out/bin/tree-from-tags
# we are using bundle exec to start in the bundled environment
cat > $bin <<EOF
#!/bin/sh -e
exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@"
EOF
chmod +x $bin
'';
meta = {
description = "Create file hierarchies from media tags";
homepage = "https://www.emacswiki.org/emacs/Bongo";
platforms = ruby.meta.platforms;
maintainers = with lib.maintainers; [
livnev
dbrock
];
license = lib.licenses.gpl2Plus;
mainProgram = "tree-from-tags";
};
}
pkgs/by-name/tu/turbo-unwrapped/package.nix
+10 -19
View File
@@ -1,11 +1,10 @@
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
stdenv,
apple-sdk_11,
capnproto,
darwin,
extra-cmake-modules,
fetchFromGitHub,
fontconfig,
llvmPackages,
nix-update-script,
@@ -13,6 +12,7 @@
pkg-config,
protobuf,
rust-jemalloc-sys,
rustPlatform,
zlib,
}:
@@ -39,21 +39,12 @@ rustPlatform.buildRustPackage rec {
# https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies
++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools;
buildInputs =
[
fontconfig
openssl
rust-jemalloc-sys
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk_11_0.frameworks;
[
CoreFoundation
CoreServices
IOKit
]
);
buildInputs = [
fontconfig
openssl
rust-jemalloc-sys
zlib
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
cargoBuildFlags = [
"--package"
pkgs/by-name/ve/ventoy/package.nix
+2 -2
View File
@@ -28,8 +28,8 @@
, withXfs ? false
, withExt4 ? false
, withNtfs ? false
, withGtk3 ? false
, withQt5 ? false
, withGtk3 ? defaultGuiType == "gtk3"
, withQt5 ? defaultGuiType == "qt5"
, libsForQt5
}:
pkgs/by-name/wa/wapiti/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "wapiti";
version = "3.2.0";
version = "3.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "wapiti-scanner";
repo = "wapiti";
rev = "refs/tags/${version}";
hash = "sha256-Ekh31MXqxY6iSyQRX0YZ0Tl7DFhYqGtOepYS/VObZc0=";
hash = "sha256-28PGdaOhFz9onw3yFHtCbAxLmh7q0VLGNuyI1wcKLRQ=";
};
pythonRelaxDeps = true;
pkgs/by-name/wo/woomer/package.nix
+7 -1
View File
@@ -66,7 +66,13 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "woomer";
inherit (wayland.meta) platforms;
# Not all platforms supported by Wayland are supported by the libraries
# used here
#
# "unresolved import `nix::sys::memfd`"
# https://github.com/waycrate/wayshot/blob/cb6bd68dbbe6ab70a5d8fe3bd04cc154f0631cd8/libwayshot/src/screencopy.rs#L11
# https://github.com/nix-rust/nix/blob/0e4353a368abfcedea4ebe4345cf7604bb61d238/src/sys/mod.rs#L40-L44
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
# TODO: Remove after upstream is no longer affected by
# https://github.com/raylib-rs/raylib-rs/issues/74
broken = stdenv.hostPlatform.isAarch64;
pkgs/development/haskell-modules/configuration-darwin.nix
+6
View File
@@ -94,6 +94,12 @@ self: super: ({
'';
}) super.git-annex;
# on*Finish tests rely on a threadDelay timing differential of 0.1s.
# You'd think that's plenty of time even though immediate rescheduling
# after threadDelay is not guaranteed. However, it appears that these
# tests are quite flaky on Darwin.
immortal = dontCheck super.immortal;
# Prevents needing to add `security_tool` as a run-time dependency for
# everything using x509-system to give access to the `security` executable.
#
pkgs/development/lua-modules/generated-packages.nix
+41 -41
View File
@@ -555,14 +555,14 @@ buildLuarocksPackage {
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.1479-1";
version = "0.0.1481-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.1479-1.rockspec";
sha256 = "1xj0vw2y9y0ff88gcsh1q8vg9lsrsak435pzx8bizpcxkpaqizc4";
url = "mirror://luarocks/fzf-lua-0.0.1481-1.rockspec";
sha256 = "1n9xj89pzi6lmhsjq2s4aqgbk1xvz1ai0g2w4821p4j28f963gs7";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/ce1e24f2a48089b65deefcb0a71a9856839002b5.zip";
sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx";
url = "https://github.com/ibhagwan/fzf-lua/archive/6fbf7a9ee29e1e3e4cfd1af5c6406042e776883d.zip";
sha256 = "0ppdz4xch9npb1ybhx35s2xk067nwgk4l1gvgfajpqlxm3r4mh6h";
};
disabled = luaOlder "5.1";
@@ -606,8 +606,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "ee7634ab4f0a6606438fe13e16cbf2065589a5ed";
hash = "sha256-jR7/rX2bsOMkWc4MHMRlBDdELgl8JOVjGOcx6bl/nYw=";
rev = "9521fe8be39255b9abc6ec54e352bf04c410f5cf";
hash = "sha256-r5xleskWXIfQz9TIXWb/DCddVlsDsOMlnLCWoxUexe4=";
};
disabled = lua.luaversion != "5.1";
@@ -2492,14 +2492,14 @@ buildLuarocksPackage {
lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lz.n";
version = "2.9.1-1";
version = "2.9.2-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lz.n-2.9.1-1.rockspec";
sha256 = "0x2xgmgxj9zvpa9x57981j3g21wm3zsylpwidk0wsbln7nag6b92";
url = "mirror://luarocks/lz.n-2.9.2-1.rockspec";
sha256 = "08xn5r8ghimnbn92ngsvg4d1924xy1vlj9vyghzbgfidg7802h8j";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.1.zip";
sha256 = "1xk4m8i61aiwcd9k5xp3wpn3frxkkjy5fk2921qkma1vsadd83yk";
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.2.zip";
sha256 = "0h4s192mvmyd7isjkjjpy7xv9srry830gm0jg3iw61iwxv6qplpr";
};
disabled = luaOlder "5.1";
@@ -2538,14 +2538,14 @@ buildLuarocksPackage {
lzn-auto-require = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, lz-n }:
buildLuarocksPackage {
pname = "lzn-auto-require";
version = "0.1.0-1";
version = "0.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lzn-auto-require-0.1.0-1.rockspec";
sha256 = "01yx40yvj6msh42cyj3vbmi3phdpiqafr0qv12yfj7garhxjidd3";
url = "mirror://luarocks/lzn-auto-require-0.2.0-1.rockspec";
sha256 = "02w8pvyhnlbsz56rhgjql13qkh7fk05ai1qkqvk90a8ni8w48hh3";
}).outPath;
src = fetchzip {
url = "https://github.com/horriblename/lzn-auto-require/archive/v0.1.0.zip";
sha256 = "0hkpyqw1cybrwarvxanf2drz2cbxkh77yz2qq4akhzyvidmn7ny0";
url = "https://github.com/horriblename/lzn-auto-require/archive/v0.2.0.zip";
sha256 = "1mgka1mmvpd2gfya898qdbbwrp5rpqds8manjs1s7g5x63xp6b98";
};
disabled = luaOlder "5.1";
@@ -2821,8 +2821,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "29fb4854573355792df9e156cb779f0d31308796";
hash = "sha256-dAsXxv1RtgMc1i5QrR2xqOeK6aRgYNqdYyTXVBXhVJ4=";
rev = "f17d9b4394027ff4442b298398dfcaab97e40c4f";
hash = "sha256-iNEoMl/X0nh2sAio1h+dkuobeOXRBXKFJCcElUyyW54=";
};
disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -2976,14 +2976,14 @@ buildLuarocksPackage {
rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }:
buildLuarocksPackage {
pname = "rest.nvim";
version = "3.8.3-1";
version = "3.8.4-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rest.nvim-3.8.3-1.rockspec";
sha256 = "0xz2h3z1ifydhlyrv2h13s26y2amx1x5xqppd6sq4bcg4zk82qv3";
url = "mirror://luarocks/rest.nvim-3.8.4-1.rockspec";
sha256 = "1q6wsvnfs4mmv9rhkygrb3p1bzvr96k3s39ys2bxbl65hhxc2s5s";
}).outPath;
src = fetchzip {
url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.3.zip";
sha256 = "0cjck6c2qpa13rll3n1i0a97kpzlzpmk93nl2c4lvgplc3xp6zkf";
url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.4.zip";
sha256 = "1s8vid9d2dacx86f77vx7pdwidhfxyighblchxjybj4fn1b7qwj0";
};
disabled = luaOlder "5.1";
@@ -3048,14 +3048,14 @@ buildLuarocksPackage {
rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-git.nvim";
version = "2.5.0-1";
version = "2.5.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-git.nvim-2.5.0-1.rockspec";
sha256 = "1qxmwl7b21d9cxbai24pg1pymd8pii4bgikkc017qi3dafk7baqk";
url = "mirror://luarocks/rocks-git.nvim-2.5.1-1.rockspec";
sha256 = "0mb8r5064h7yjgdaipsmgi6ha2dlxbwd73js8w23pi182fprqpvj";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.0.zip";
sha256 = "1nvq3yhmnab2frfkf5yh6ffq7rqw3rmxsbj0hbm28vg3rr9c2zjw";
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.1.zip";
sha256 = "11j9w8bz8gacphr98bpw4rbibz4gs8abawmfqhx5l86k4801z5sq";
};
disabled = luaOlder "5.1";
@@ -3072,14 +3072,14 @@ buildLuarocksPackage {
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.41.0-1";
version = "2.41.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks.nvim-2.41.0-1.rockspec";
sha256 = "1srhz85sfhkzlsy68mvwhdixvwz0awhrn530sny0287zhnrxrilp";
url = "mirror://luarocks/rocks.nvim-2.41.3-1.rockspec";
sha256 = "0a7xjvgc3i9p0iqj35kca42fii6cz3njq4fpgpcbk9nv6ghbsmcq";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.0.zip";
sha256 = "0j44chcziimqn6jm2ckbwmn97nin0dwhnnrdpm87j754kbqsj21a";
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.3.zip";
sha256 = "1rpppi3vw205gq34n948r3mj7dma2mflbgkmc98n96vm9k2ldbkl";
};
disabled = luaOlder "5.1";
@@ -3119,14 +3119,14 @@ buildLuarocksPackage {
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "rustaceanvim";
version = "5.13.0-1";
version = "5.14.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rustaceanvim-5.13.0-1.rockspec";
sha256 = "1r0b3haiix45ngl570dld84h1y36lpw2lc1vsf5z08xms45c5fay";
url = "mirror://luarocks/rustaceanvim-5.14.1-1.rockspec";
sha256 = "1xr2vvcsd525h304w1hf6ij1qfwlklyczk1bh5jd6s2hnrkwyy5b";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.13.0.zip";
sha256 = "1prlsh1fl1a3r8fcshmzwbjk3imbxg2z43xl8fwbsginpizl8g09";
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.14.1.zip";
sha256 = "1p0pqv0a415k0ndgdjy0k0p58sdvn4ngm9zymd5hn3ny9441b22v";
};
disabled = luaOlder "5.1";
@@ -3338,8 +3338,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211";
hash = "sha256-zidYSt0WrnATuCpSGGhYuafNpPPN6dJ6hEuCgFytfEk=";
rev = "85922dde3767e01d42a08e750a773effbffaea3e";
hash = "sha256-Qa/f+0asQvA8mhIUajC4BGZCI92OqA6ySVoQSC3ZY3s=";
};
disabled = lua.luaversion != "5.1";
pkgs/development/python-modules/aiojobs/default.nix
+3 -10
View File
@@ -26,13 +26,6 @@ buildPythonPackage rec {
hash = "sha256-FNc71YyAjtR+hd0UOqFAy6XW0PwHSlM76C3ecPM5vsU=";
};
patches = [
(fetchpatch {
url = "https://github.com/aio-libs/aiojobs/commit/1b88049841397b01f88aee7d92174ac5a15217c1.patch";
hash = "sha256-b38Ipa29T6bEVsPe04ZO3WCcs6+0fOQDCJM+w8K1bVY=";
})
];
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ];
@@ -56,11 +49,11 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
meta = with lib; {
meta = {
description = "Jobs scheduler for managing background task (asyncio)";
homepage = "https://github.com/aio-libs/aiojobs";
changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst";
license = licenses.asl20;
maintainers = with maintainers; [ cmcdragonkai ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ cmcdragonkai ];
};
}
pkgs/development/python-modules/django-cms/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "django-cms";
version = "4.1.3";
version = "4.1.4";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "django-cms";
repo = "django-cms";
rev = "refs/tags/${version}";
hash = "sha256-ucGxc6f2UYdmSLuyxVV2nIcl35qoeQMlk1paN6XeBFY=";
hash = "sha256-2vA1teV6IkjtDo44uwEts1OGsBZ4dXRFGrasAHmgnRA=";
};
patches = [
pkgs/development/python-modules/dnf-plugins-core/default.nix
+6 -8
View File
@@ -23,7 +23,7 @@ in
buildPythonPackage rec {
pname = "dnf-plugins-core";
version = "4.9.0";
version = "4.10.0";
format = "other";
outputs = [
@@ -35,18 +35,15 @@ buildPythonPackage rec {
owner = "rpm-software-management";
repo = "dnf-plugins-core";
rev = "refs/tags/${version}";
hash = "sha256-MQ7QZ5qn/0OU0slohwEP83w8NvSP2M+hpCDKvYqlezY=";
hash = "sha256-7MPCLnclRT07m6CrGguDxSB+sIybp4tMcExU9+Sz9EM=";
};
patches = [ ./fix-python-install-dir.patch ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" \
--replace "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \
--replace "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"
--replace-fail "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \
--replace-fail "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"
substituteInPlace doc/CMakeLists.txt \
--replace 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'
--replace-fail 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'
'';
nativeBuildInputs = [
@@ -68,6 +65,7 @@ buildPythonPackage rec {
cmakeFlags = [
"-DPYTHON_DESIRED=${pyMajor}"
"-DWITHOUT_LOCAL=0"
"-DPYTHON_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
];
postBuild = ''
pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1eea7b..00fbaf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ ELSE ()
MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED})
ENDIF()
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
SET (SYSCONFDIR /etc)
pkgs/development/python-modules/dnf4/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@ in
buildPythonPackage rec {
pname = "dnf4";
version = "4.21.1";
version = "4.22.0";
format = "other";
outputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "rpm-software-management";
repo = "dnf";
rev = version;
hash = "sha256-VYQhOlLtEzWesrMZ/d6KW0OlUjz5MvoEmPy71qEUEL4=";
hash = "sha256-I79cwK+xPmHS3z8/rKar5G5EbK6IYq0Ypq9KrShJ3sg=";
};
patches = [ ./fix-python-install-dir.patch ];
pkgs/development/python-modules/optax/default.nix
+6 -9
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
# build-system
@@ -15,22 +14,20 @@
numpy,
etils,
# checks
# tests
callPackage,
}:
buildPythonPackage rec {
pname = "optax";
version = "0.2.3";
version = "0.2.4";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "deepmind";
repo = "optax";
rev = "refs/tags/v${version}";
hash = "sha256-D1qKei3IjDP9fC62hf6fNtvHlnn09O/dKuzTBdLwW64=";
hash = "sha256-7UPWeo/Q9/tjewaM7HN8/e7U1U1QzAliuk95+9GOi0E=";
};
outputs = [
@@ -63,11 +60,11 @@ buildPythonPackage rec {
pytest = callPackage ./tests.nix { };
};
meta = with lib; {
meta = {
description = "Gradient processing and optimization library for JAX";
homepage = "https://github.com/deepmind/optax";
changelog = "https://github.com/deepmind/optax/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ndl ];
};
}
pkgs/development/python-modules/pynvim/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pynvim";
version = "0.5.1";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "neovim";
repo = "pynvim";
rev = "refs/tags/${version}";
hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY=";
hash = "sha256-/frugwYPS4rS4L6BRsmNb5pJI8xfLJvbr+PyOLx25a4=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pyramid-multiauth/default.nix
+11 -7
View File
@@ -3,8 +3,9 @@
buildPythonPackage,
fetchFromGitHub,
pyramid,
unittestCheckHook,
pytestCheckHook,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
@@ -19,17 +20,20 @@ buildPythonPackage rec {
hash = "sha256-Bz53iCGsl6WZASIvBQ1pFfcGLra82vA2OLWjhLVdkrw=";
};
nativeBuildInputs = [ setuptools ];
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [ pyramid ];
dependencies = [ pyramid ];
nativeCheckInputs = [ unittestCheckHook ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
changelog = "https://github.com/mozilla-services/pyramid_multiauth/releases/tag/${version}";
description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
homepage = "https://github.com/mozilla-services/pyramid_multiauth";
license = licenses.mpl20;
maintainers = [ ];
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
};
}
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1264";
version = "3.0.1265";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-o7HLfcwPE4Fl+0+A5lGb1K1sBJ9Cm01cFrkZL6w0QJE=";
hash = "sha256-7W74JPGht8lyyfjTXx0VQoRJr18R98WFGoyGCJlSvTU=";
};
build-system = [ setuptools ];
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+19 -19
View File
@@ -427,6 +427,25 @@ if [[ -z $flake && -e /etc/nixos/flake.nix && -z $noFlake ]]; then
flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")"
fi
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
if [[ ${#tmpDir} -ge 60 ]]; then
# Very long tmp dirs lead to "too long for Unix domain socket"
# SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
rmdir "$tmpDir"
tmpDir=$(TMPDIR= mktemp -t -d nixos-rebuild.XXXXXX)
fi
cleanup() {
for ctrl in "$tmpDir"/ssh-*; do
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
done
rm -rf "$tmpDir"
}
trap cleanup EXIT
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
# For convenience, use the hostname as the default configuration to
# build from the flake.
if [[ -n $flake ]]; then
@@ -450,23 +469,6 @@ if [[ ! -z "$specialisation" && ! "$action" = switch && ! "$action" = test ]]; t
exit 1
fi
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
if [[ ${#tmpDir} -ge 60 ]]; then
# Very long tmp dirs lead to "too long for Unix domain socket"
# SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
rmdir "$tmpDir"
tmpDir=$(TMPDIR= mktemp -t -d nixos-rebuild.XXXXXX)
fi
cleanup() {
for ctrl in "$tmpDir"/ssh-*; do
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
done
rm -rf "$tmpDir"
}
trap cleanup EXIT
# Re-execute nixos-rebuild from the Nixpkgs tree.
if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then
@@ -510,8 +512,6 @@ if [ "$action" = edit ]; then
exit 1
fi
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
# First build Nix, since NixOS may require a newer version than the
# current one.
if [[ -n "$rollback" || "$action" = dry-build ]]; then
pkgs/servers/matrix-synapse/default.nix
+3 -3
View File
@@ -17,20 +17,20 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.118.0";
version = "1.119.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-dMa1L1MYzt/XfCD8hGt+WupAwl5l4zwVcj5mQ8KtTp8=";
hash = "sha256-+3FrxSfQteIga5uiRNzAlV+xNESB9PUX/UkkL6UMETQ=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-FJaj5T2wMIn/A0JNUGpXyNtPvXIAF8Ivkej4vS1S3dA=";
hash = "sha256-c/19RaBmtfKkFFQyDBwH+yqHp4YNQSqCu23WYbpOc98=";
};
postPatch = ''
pkgs/tools/package-management/libdnf/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.73.3";
version = "0.73.4";
outputs = [
"out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "rpm-software-management";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-XzPpjnmL2wwLZnLAJLuOQGWXAoCJnij14P6qSXglMhY=";
hash = "sha256-O8pN2WFHWxZpr2JEPsQOmkc+7qnMVnptmGJCVxMmSLo=";
};
nativeBuildInputs = [
pkgs/tools/security/nitrokey-app2/default.nix
+7 -1
View File
@@ -5,6 +5,7 @@
, wrapQtAppsHook
, qtbase
, qtwayland
, qtsvg
}:
python3.pkgs.buildPythonApplication rec {
@@ -27,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
];
buildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [
qtwayland
qtwayland qtsvg
];
propagatedBuildInputs = with python3.pkgs; [
@@ -43,6 +44,11 @@ python3.pkgs.buildPythonApplication rec {
"nitrokeyapp"
];
postInstall = ''
install -Dm755 meta/com.nitrokey.nitrokey-app2.desktop $out/share/applications/com.nitrokey.nitrokey-app2.desktop
install -Dm755 meta/nk-app2.png $out/share/icons/hicolor/128x128/apps/com.nitrokey.nitrokey-app2.png
'';
meta = with lib; {
description = "This application allows to manage Nitrokey 3 devices";
homepage = "https://github.com/Nitrokey/nitrokey-app2";
pkgs/top-level/all-packages.nix
+4 -2
View File
@@ -16115,8 +16115,6 @@ with pkgs;
wlroots = wlroots_0_18;
};
tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -19250,4 +19248,8 @@ with pkgs;
cantata = callPackage ../by-name/ca/cantata/package.nix {
ffmpeg = ffmpeg_6;
};
tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix {
ruby = ruby_3_1;
};
}