Merge master into haskell-updates
This commit is contained in:
commit
0c086da2bb
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@ -27,7 +27,6 @@
|
||||
/lib/asserts.nix @infinisil @Profpatsch
|
||||
/lib/path.* @infinisil @fricklerhandwerk
|
||||
/lib/fileset @infinisil
|
||||
/doc/functions/fileset.section.md @infinisil
|
||||
|
||||
# Nixpkgs Internals
|
||||
/default.nix @Ericson2314
|
||||
|
@ -98,24 +98,30 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
|
||||
|
||||
## Custom packages {#sec-language-texlive-custom-packages}
|
||||
|
||||
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.
|
||||
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its `"tex"` output, according to the [TeX Directory Structure](https://tug.ctan.org/tds/tds.html). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.
|
||||
|
||||
Such derivation must then be listed in the attribute `pkgs` of an attribute set passed to `texlive.combine`, for instance by passing `extraPkgs = { pkgs = [ custom_package ]; };`. Within Nixpkgs, `pkgs` should be part of the derivation itself, allowing users to call `texlive.combine { inherit (texlive) scheme-small; inherit some_tex_package; }`.
|
||||
The functions `texlive.combine` and `texlive.withPackages` recognise the following outputs:
|
||||
|
||||
Here is a (very verbose) example where the attribute `pkgs` is attached to the derivation itself, which requires creating a fixed point. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.
|
||||
- `"out"`: contents are linked in the TeX Live environment, and binaries in the `$out/bin` folder are wrapped;
|
||||
- `"tex"`: linked in `$TEXMFDIST`; files should follow the TDS (for instance `$tex/tex/latex/foiltex/foiltex.cls`);
|
||||
- `"texdoc"`, `"texsource"`: ignored by default, treated as `"tex"`;
|
||||
- `"tlpkg"`: linked in `$TEXMFROOT/tlpkg`;
|
||||
- `"man"`, `"info"`, ...: the other outputs are combined into separate outputs.
|
||||
|
||||
When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bin"`, `"run"`, `"doc"`, `"source"`, `"tlpkg"` to the above outputs.
|
||||
|
||||
Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
|
||||
let
|
||||
foiltex = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
foiltex = stdenvNoCC.mkDerivation {
|
||||
pname = "latex-foiltex";
|
||||
version = "2.1.4b";
|
||||
passthru = {
|
||||
pkgs = [ finalAttrs.finalPackage ];
|
||||
tlDeps = with texlive; [ latex ];
|
||||
tlType = "run";
|
||||
};
|
||||
|
||||
outputs = [ "tex" "texdoc" ];
|
||||
passthru.tlDeps = with texlive; [ latex ];
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
@ -138,7 +144,13 @@ let
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ texlive.combined.scheme-small ];
|
||||
nativeBuildInputs = [
|
||||
(texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ]))
|
||||
# multiple-outputs.sh fails if $out is not defined
|
||||
(writeShellScript "force-tex-output.sh" ''
|
||||
out="''${tex-}"
|
||||
'')
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -148,15 +160,23 @@ let
|
||||
# Generate the style files
|
||||
latex foiltex.ins
|
||||
|
||||
# Generate the documentation
|
||||
export HOME=.
|
||||
latexmk -pdf foiltex.dtx
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
path="$out/tex/latex/foiltex"
|
||||
path="$tex/tex/latex/foiltex"
|
||||
mkdir -p "$path"
|
||||
cp *.{cls,def,clo} "$path/"
|
||||
cp *.{cls,def,clo,sty} "$path/"
|
||||
|
||||
path="$texdoc/doc/tex/latex/foiltex"
|
||||
mkdir -p "$path"
|
||||
cp *.pdf "$path/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@ -167,12 +187,9 @@ let
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
});
|
||||
|
||||
latex_with_foiltex = texlive.combine {
|
||||
inherit (texlive) scheme-small;
|
||||
inherit foiltex;
|
||||
};
|
||||
|
||||
latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]);
|
||||
in
|
||||
runCommand "test.pdf" {
|
||||
nativeBuildInputs = [ latex_with_foiltex ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Operations on attribute sets. */
|
||||
{ lib }:
|
||||
# Operations on attribute sets.
|
||||
|
||||
let
|
||||
inherit (builtins) head tail length;
|
||||
|
@ -3,10 +3,52 @@
|
||||
[]{#sec-fileset}
|
||||
|
||||
The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_.
|
||||
A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations.
|
||||
A file set is a (mathematical) set of local files that can be added to the Nix store for use in Nix derivations.
|
||||
File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes.
|
||||
|
||||
See the [function reference](#sec-functions-library-fileset) for function-specific documentation.
|
||||
## Overview {#sec-fileset-overview}
|
||||
|
||||
Basics:
|
||||
- [Implicit coercion from paths to file sets](#sec-fileset-path-coercion)
|
||||
|
||||
- [`lib.fileset.trace`](#function-library-lib.fileset.trace)/[`lib.fileset.traceVal`](#function-library-lib.fileset.trace):
|
||||
|
||||
Pretty-print file sets for debugging.
|
||||
|
||||
- [`lib.fileset.toSource`](#function-library-lib.fileset.toSource):
|
||||
|
||||
Add files in file sets to the store to use as derivation sources.
|
||||
|
||||
Combinators:
|
||||
- [`lib.fileset.union`](#function-library-lib.fileset.union)/[`lib.fileset.unions`](#function-library-lib.fileset.unions):
|
||||
|
||||
Create a larger file set from all the files in multiple file sets.
|
||||
|
||||
- [`lib.fileset.intersection`](#function-library-lib.fileset.intersection):
|
||||
|
||||
Create a smaller file set from only the files in both file sets.
|
||||
|
||||
- [`lib.fileset.difference`](#function-library-lib.fileset.difference):
|
||||
|
||||
Create a smaller file set containing all files that are in one file set, but not another one.
|
||||
|
||||
Filtering:
|
||||
- [`lib.fileset.fileFilter`](#function-library-lib.fileset.fileFilter):
|
||||
|
||||
Create a file set from all files that satisisfy a predicate in a directory.
|
||||
|
||||
Utilities:
|
||||
- [`lib.fileset.fromSource`](#function-library-lib.fileset.fromSource):
|
||||
|
||||
Create a file set from a `lib.sources`-based value.
|
||||
|
||||
- [`lib.fileset.gitTracked`](#function-library-lib.fileset.gitTracked)/[`lib.fileset.gitTrackedWith`](#function-library-lib.fileset.gitTrackedWith):
|
||||
|
||||
Create a file set from all tracked files in a local Git repository.
|
||||
|
||||
If you need more file set functions,
|
||||
see [this issue](https://github.com/NixOS/nixpkgs/issues/266356) to request it.
|
||||
|
||||
|
||||
## Implicit coercion from paths to file sets {#sec-fileset-path-coercion}
|
||||
|
||||
@ -106,6 +148,96 @@ let
|
||||
|
||||
in {
|
||||
|
||||
/*
|
||||
Incrementally evaluate and trace a file set in a pretty way.
|
||||
This function is only intended for debugging purposes.
|
||||
The exact tracing format is unspecified and may change.
|
||||
|
||||
This function takes a final argument to return.
|
||||
In comparison, [`traceVal`](#function-library-lib.fileset.traceVal) returns
|
||||
the given file set argument.
|
||||
|
||||
This variant is useful for tracing file sets in the Nix repl.
|
||||
|
||||
Type:
|
||||
trace :: FileSet -> Any -> Any
|
||||
|
||||
Example:
|
||||
trace (unions [ ./Makefile ./src ./tests/run.sh ]) null
|
||||
=>
|
||||
trace: /home/user/src/myProject
|
||||
trace: - Makefile (regular)
|
||||
trace: - src (all files in directory)
|
||||
trace: - tests
|
||||
trace: - run.sh (regular)
|
||||
null
|
||||
*/
|
||||
trace =
|
||||
/*
|
||||
The file set to trace.
|
||||
|
||||
This argument can also be a path,
|
||||
which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
|
||||
*/
|
||||
fileset:
|
||||
let
|
||||
# "fileset" would be a better name, but that would clash with the argument name,
|
||||
# and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76
|
||||
actualFileset = _coerce "lib.fileset.trace: Argument" fileset;
|
||||
in
|
||||
seq
|
||||
(_printFileset actualFileset)
|
||||
(x: x);
|
||||
|
||||
/*
|
||||
Incrementally evaluate and trace a file set in a pretty way.
|
||||
This function is only intended for debugging purposes.
|
||||
The exact tracing format is unspecified and may change.
|
||||
|
||||
This function returns the given file set.
|
||||
In comparison, [`trace`](#function-library-lib.fileset.trace) takes another argument to return.
|
||||
|
||||
This variant is useful for tracing file sets passed as arguments to other functions.
|
||||
|
||||
Type:
|
||||
traceVal :: FileSet -> FileSet
|
||||
|
||||
Example:
|
||||
toSource {
|
||||
root = ./.;
|
||||
fileset = traceVal (unions [
|
||||
./Makefile
|
||||
./src
|
||||
./tests/run.sh
|
||||
]);
|
||||
}
|
||||
=>
|
||||
trace: /home/user/src/myProject
|
||||
trace: - Makefile (regular)
|
||||
trace: - src (all files in directory)
|
||||
trace: - tests
|
||||
trace: - run.sh (regular)
|
||||
"/nix/store/...-source"
|
||||
*/
|
||||
traceVal =
|
||||
/*
|
||||
The file set to trace and return.
|
||||
|
||||
This argument can also be a path,
|
||||
which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
|
||||
*/
|
||||
fileset:
|
||||
let
|
||||
# "fileset" would be a better name, but that would clash with the argument name,
|
||||
# and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76
|
||||
actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset;
|
||||
in
|
||||
seq
|
||||
(_printFileset actualFileset)
|
||||
# We could also return the original fileset argument here,
|
||||
# but that would then duplicate work for consumers of the fileset, because then they have to coerce it again
|
||||
actualFileset;
|
||||
|
||||
/*
|
||||
Add the local files contained in `fileset` to the store as a single [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) rooted at `root`.
|
||||
|
||||
@ -250,75 +382,6 @@ in {
|
||||
filter = sourceFilter;
|
||||
};
|
||||
|
||||
/*
|
||||
Create a file set with the same files as a `lib.sources`-based value.
|
||||
This does not import any of the files into the store.
|
||||
|
||||
This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`.
|
||||
|
||||
A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource).
|
||||
|
||||
:::{.note}
|
||||
File sets cannot represent empty directories.
|
||||
Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories.
|
||||
:::
|
||||
|
||||
Type:
|
||||
fromSource :: SourceLike -> FileSet
|
||||
|
||||
Example:
|
||||
# There's no cleanSource-like function for file sets yet,
|
||||
# but we can just convert cleanSource to a file set and use it that way
|
||||
toSource {
|
||||
root = ./.;
|
||||
fileset = fromSource (lib.sources.cleanSource ./.);
|
||||
}
|
||||
|
||||
# Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`),
|
||||
# but removing a subdirectory using file set functions
|
||||
difference
|
||||
(fromSource (lib.sources.sourceByRegex ./. [
|
||||
"^README\.md$"
|
||||
# This regex includes everything in ./doc
|
||||
"^doc(/.*)?$"
|
||||
])
|
||||
./doc/generated
|
||||
|
||||
# Use cleanSource, but limit it to only include ./Makefile and files under ./src
|
||||
intersection
|
||||
(fromSource (lib.sources.cleanSource ./.))
|
||||
(unions [
|
||||
./Makefile
|
||||
./src
|
||||
]);
|
||||
*/
|
||||
fromSource = source:
|
||||
let
|
||||
# This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`,
|
||||
# which are technically internal to lib.sources,
|
||||
# but we'll allow this since both libraries are in the same code base
|
||||
# and this function is a bridge between them.
|
||||
isFiltered = source ? _isLibCleanSourceWith;
|
||||
path = if isFiltered then source.origSrc else source;
|
||||
in
|
||||
# We can only support sources created from paths
|
||||
if ! isPath path then
|
||||
if isStringLike path then
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead.
|
||||
Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.''
|
||||
else
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.''
|
||||
else if ! pathExists path then
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.''
|
||||
else if isFiltered then
|
||||
_fromSourceFilter path source.filter
|
||||
else
|
||||
# If there's no filter, no need to run the expensive conversion, all subpaths will be included
|
||||
_singleton path;
|
||||
|
||||
/*
|
||||
The file set containing all files that are in either of two given file sets.
|
||||
This is the same as [`unions`](#function-library-lib.fileset.unions),
|
||||
@ -411,66 +474,6 @@ in {
|
||||
_unionMany
|
||||
];
|
||||
|
||||
/*
|
||||
Filter a file set to only contain files matching some predicate.
|
||||
|
||||
Type:
|
||||
fileFilter ::
|
||||
({
|
||||
name :: String,
|
||||
type :: String,
|
||||
...
|
||||
} -> Bool)
|
||||
-> Path
|
||||
-> FileSet
|
||||
|
||||
Example:
|
||||
# Include all regular `default.nix` files in the current directory
|
||||
fileFilter (file: file.name == "default.nix") ./.
|
||||
|
||||
# Include all non-Nix files from the current directory
|
||||
fileFilter (file: ! hasSuffix ".nix" file.name) ./.
|
||||
|
||||
# Include all files that start with a "." in the current directory
|
||||
fileFilter (file: hasPrefix "." file.name) ./.
|
||||
|
||||
# Include all regular files (not symlinks or others) in the current directory
|
||||
fileFilter (file: file.type == "regular") ./.
|
||||
*/
|
||||
fileFilter =
|
||||
/*
|
||||
The predicate function to call on all files contained in given file set.
|
||||
A file is included in the resulting file set if this function returns true for it.
|
||||
|
||||
This function is called with an attribute set containing these attributes:
|
||||
|
||||
- `name` (String): The name of the file
|
||||
|
||||
- `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file.
|
||||
This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path.
|
||||
|
||||
Other attributes may be added in the future.
|
||||
*/
|
||||
predicate:
|
||||
# The path whose files to filter
|
||||
path:
|
||||
if ! isFunction predicate then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.''
|
||||
else if ! isPath path then
|
||||
if path._type or "" == "fileset" then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead.
|
||||
If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.''
|
||||
else
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.''
|
||||
else if ! pathExists path then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.''
|
||||
else
|
||||
_fileFilter predicate path;
|
||||
|
||||
/*
|
||||
The file set containing all files that are in both of two given file sets.
|
||||
See also [Intersection (set theory)](https://en.wikipedia.org/wiki/Intersection_(set_theory)).
|
||||
@ -563,94 +566,133 @@ in {
|
||||
(elemAt filesets 1);
|
||||
|
||||
/*
|
||||
Incrementally evaluate and trace a file set in a pretty way.
|
||||
This function is only intended for debugging purposes.
|
||||
The exact tracing format is unspecified and may change.
|
||||
|
||||
This function takes a final argument to return.
|
||||
In comparison, [`traceVal`](#function-library-lib.fileset.traceVal) returns
|
||||
the given file set argument.
|
||||
|
||||
This variant is useful for tracing file sets in the Nix repl.
|
||||
Filter a file set to only contain files matching some predicate.
|
||||
|
||||
Type:
|
||||
trace :: FileSet -> Any -> Any
|
||||
fileFilter ::
|
||||
({
|
||||
name :: String,
|
||||
type :: String,
|
||||
...
|
||||
} -> Bool)
|
||||
-> Path
|
||||
-> FileSet
|
||||
|
||||
Example:
|
||||
trace (unions [ ./Makefile ./src ./tests/run.sh ]) null
|
||||
=>
|
||||
trace: /home/user/src/myProject
|
||||
trace: - Makefile (regular)
|
||||
trace: - src (all files in directory)
|
||||
trace: - tests
|
||||
trace: - run.sh (regular)
|
||||
null
|
||||
*/
|
||||
trace =
|
||||
/*
|
||||
The file set to trace.
|
||||
# Include all regular `default.nix` files in the current directory
|
||||
fileFilter (file: file.name == "default.nix") ./.
|
||||
|
||||
This argument can also be a path,
|
||||
which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
|
||||
# Include all non-Nix files from the current directory
|
||||
fileFilter (file: ! hasSuffix ".nix" file.name) ./.
|
||||
|
||||
# Include all files that start with a "." in the current directory
|
||||
fileFilter (file: hasPrefix "." file.name) ./.
|
||||
|
||||
# Include all regular files (not symlinks or others) in the current directory
|
||||
fileFilter (file: file.type == "regular") ./.
|
||||
*/
|
||||
fileFilter =
|
||||
/*
|
||||
The predicate function to call on all files contained in given file set.
|
||||
A file is included in the resulting file set if this function returns true for it.
|
||||
|
||||
This function is called with an attribute set containing these attributes:
|
||||
|
||||
- `name` (String): The name of the file
|
||||
|
||||
- `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file.
|
||||
This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path.
|
||||
|
||||
Other attributes may be added in the future.
|
||||
*/
|
||||
fileset:
|
||||
let
|
||||
# "fileset" would be a better name, but that would clash with the argument name,
|
||||
# and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76
|
||||
actualFileset = _coerce "lib.fileset.trace: Argument" fileset;
|
||||
in
|
||||
seq
|
||||
(_printFileset actualFileset)
|
||||
(x: x);
|
||||
predicate:
|
||||
# The path whose files to filter
|
||||
path:
|
||||
if ! isFunction predicate then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.''
|
||||
else if ! isPath path then
|
||||
if path._type or "" == "fileset" then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead.
|
||||
If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.''
|
||||
else
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.''
|
||||
else if ! pathExists path then
|
||||
throw ''
|
||||
lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.''
|
||||
else
|
||||
_fileFilter predicate path;
|
||||
|
||||
/*
|
||||
Incrementally evaluate and trace a file set in a pretty way.
|
||||
This function is only intended for debugging purposes.
|
||||
The exact tracing format is unspecified and may change.
|
||||
Create a file set with the same files as a `lib.sources`-based value.
|
||||
This does not import any of the files into the store.
|
||||
|
||||
This function returns the given file set.
|
||||
In comparison, [`trace`](#function-library-lib.fileset.trace) takes another argument to return.
|
||||
This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`.
|
||||
|
||||
This variant is useful for tracing file sets passed as arguments to other functions.
|
||||
A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource).
|
||||
|
||||
Type:
|
||||
traceVal :: FileSet -> FileSet
|
||||
:::{.note}
|
||||
File sets cannot represent empty directories.
|
||||
Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories.
|
||||
:::
|
||||
|
||||
Example:
|
||||
toSource {
|
||||
root = ./.;
|
||||
fileset = traceVal (unions [
|
||||
./Makefile
|
||||
./src
|
||||
./tests/run.sh
|
||||
]);
|
||||
}
|
||||
=>
|
||||
trace: /home/user/src/myProject
|
||||
trace: - Makefile (regular)
|
||||
trace: - src (all files in directory)
|
||||
trace: - tests
|
||||
trace: - run.sh (regular)
|
||||
"/nix/store/...-source"
|
||||
Type:
|
||||
fromSource :: SourceLike -> FileSet
|
||||
|
||||
Example:
|
||||
# There's no cleanSource-like function for file sets yet,
|
||||
# but we can just convert cleanSource to a file set and use it that way
|
||||
toSource {
|
||||
root = ./.;
|
||||
fileset = fromSource (lib.sources.cleanSource ./.);
|
||||
}
|
||||
|
||||
# Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`),
|
||||
# but removing a subdirectory using file set functions
|
||||
difference
|
||||
(fromSource (lib.sources.sourceByRegex ./. [
|
||||
"^README\.md$"
|
||||
# This regex includes everything in ./doc
|
||||
"^doc(/.*)?$"
|
||||
])
|
||||
./doc/generated
|
||||
|
||||
# Use cleanSource, but limit it to only include ./Makefile and files under ./src
|
||||
intersection
|
||||
(fromSource (lib.sources.cleanSource ./.))
|
||||
(unions [
|
||||
./Makefile
|
||||
./src
|
||||
]);
|
||||
*/
|
||||
traceVal =
|
||||
/*
|
||||
The file set to trace and return.
|
||||
|
||||
This argument can also be a path,
|
||||
which gets [implicitly coerced to a file set](#sec-fileset-path-coercion).
|
||||
*/
|
||||
fileset:
|
||||
fromSource = source:
|
||||
let
|
||||
# "fileset" would be a better name, but that would clash with the argument name,
|
||||
# and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76
|
||||
actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset;
|
||||
# This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`,
|
||||
# which are technically internal to lib.sources,
|
||||
# but we'll allow this since both libraries are in the same code base
|
||||
# and this function is a bridge between them.
|
||||
isFiltered = source ? _isLibCleanSourceWith;
|
||||
path = if isFiltered then source.origSrc else source;
|
||||
in
|
||||
seq
|
||||
(_printFileset actualFileset)
|
||||
# We could also return the original fileset argument here,
|
||||
# but that would then duplicate work for consumers of the fileset, because then they have to coerce it again
|
||||
actualFileset;
|
||||
# We can only support sources created from paths
|
||||
if ! isPath path then
|
||||
if isStringLike path then
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead.
|
||||
Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.''
|
||||
else
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.''
|
||||
else if ! pathExists path then
|
||||
throw ''
|
||||
lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.''
|
||||
else if isFiltered then
|
||||
_fromSourceFilter path source.filter
|
||||
else
|
||||
# If there's no filter, no need to run the expensive conversion, all subpaths will be included
|
||||
_singleton path;
|
||||
|
||||
/*
|
||||
Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository.
|
||||
|
@ -1,5 +1,7 @@
|
||||
# Functions for querying information about the filesystem
|
||||
# without copying any files to the Nix store.
|
||||
/*
|
||||
Functions for querying information about the filesystem
|
||||
without copying any files to the Nix store.
|
||||
*/
|
||||
{ lib }:
|
||||
|
||||
# Tested in lib/tests/filesystem.sh
|
||||
|
@ -1,16 +1,17 @@
|
||||
/*
|
||||
A partial and basic implementation of GVariant formatted strings.
|
||||
See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details.
|
||||
|
||||
:::{.warning}
|
||||
This API is not considered fully stable and it might therefore
|
||||
change in backwards incompatible ways without prior notice.
|
||||
:::
|
||||
*/
|
||||
|
||||
# This file is based on https://github.com/nix-community/home-manager
|
||||
# Copyright (c) 2017-2022 Home Manager contributors
|
||||
#
|
||||
|
||||
|
||||
{ lib }:
|
||||
|
||||
/* A partial and basic implementation of GVariant formatted strings.
|
||||
See https://docs.gtk.org/glib/gvariant-format-strings.html for detauls.
|
||||
|
||||
Note, this API is not considered fully stable and it might therefore
|
||||
change in backwards incompatible ways without prior notice.
|
||||
*/
|
||||
let
|
||||
inherit (lib)
|
||||
concatMapStringsSep concatStrings escape head replaceStrings;
|
||||
|
@ -1,5 +1,4 @@
|
||||
# General list operations.
|
||||
|
||||
/* General list operations. */
|
||||
{ lib }:
|
||||
let
|
||||
inherit (lib.strings) toInt;
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Nixpkgs/NixOS option handling.
|
||||
/* Nixpkgs/NixOS option handling. */
|
||||
{ lib }:
|
||||
|
||||
let
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Functions for working with paths, see ./path.md
|
||||
/* Functions for working with path values. */
|
||||
# See ./README.md for internal docs
|
||||
{ lib }:
|
||||
let
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Functions for copying sources to the Nix store.
|
||||
/* Functions for copying sources to the Nix store. */
|
||||
{ lib }:
|
||||
|
||||
# Tested in lib/tests/sources.sh
|
||||
|
@ -8355,12 +8355,6 @@
|
||||
fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B";
|
||||
}];
|
||||
};
|
||||
jfrankenau = {
|
||||
email = "johannes@frankenau.net";
|
||||
github = "jfrankenau";
|
||||
githubId = 2736480;
|
||||
name = "Johannes Frankenau";
|
||||
};
|
||||
jfroche = {
|
||||
name = "Jean-François Roche";
|
||||
email = "jfroche@pyxel.be";
|
||||
@ -10071,6 +10065,15 @@
|
||||
githubId = 887072;
|
||||
name = "Alexander Lebedev";
|
||||
};
|
||||
lecoqjacob = {
|
||||
name = "Jacob LeCoq";
|
||||
email = "lecoqjacob@gmail.com";
|
||||
githubId = 9278174;
|
||||
github = "lecoqjacob";
|
||||
keys = [{
|
||||
fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D";
|
||||
}];
|
||||
};
|
||||
ledif = {
|
||||
email = "refuse@gmail.com";
|
||||
github = "ledif";
|
||||
|
@ -219,7 +219,6 @@ with lib.maintainers; {
|
||||
cole-h
|
||||
grahamc
|
||||
hoverbear
|
||||
lheckemann
|
||||
];
|
||||
scope = "Group registration for packages maintained by Determinate Systems.";
|
||||
shortName = "Determinate Systems employees";
|
||||
@ -678,18 +677,6 @@ with lib.maintainers; {
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
numtide = {
|
||||
members = [
|
||||
mic92
|
||||
flokli
|
||||
jfroche
|
||||
tazjin
|
||||
zimbatm
|
||||
];
|
||||
scope = "Group registration for Numtide team members who collectively maintain packages.";
|
||||
shortName = "Numtide team";
|
||||
};
|
||||
|
||||
ocaml = {
|
||||
members = [
|
||||
alizter
|
||||
|
@ -428,6 +428,8 @@
|
||||
|
||||
- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0).
|
||||
|
||||
- The iptables firewall module now installs the `nixos-firewall-tool` which allows the user to easily temporarily open ports through the firewall.
|
||||
|
||||
- Elixir now defaults to version
|
||||
[v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/).
|
||||
|
||||
@ -551,6 +553,8 @@ The module update takes care of the new config syntax and the data itself (user
|
||||
|
||||
- The argument `vendorSha256` of `buildGoModule` is deprecated. Use `vendorHash` instead. ([\#259999](https://github.com/NixOS/nixpkgs/pull/259999))
|
||||
|
||||
- TeX Live environments can now be built with the new `texlive.withPackages`. The procedure for creating custom TeX packages has been changed, see the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#sec-language-texlive-custom-packages) for more details.
|
||||
|
||||
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
|
||||
|
||||
- Node.js v14, v16 has been removed as they were end of life. Any dependent packages that contributors were not able to reasonably upgrade were dropped after a month of notice to their maintainers, were **removed**.
|
||||
|
@ -881,6 +881,7 @@
|
||||
./services/networking/bitlbee.nix
|
||||
./services/networking/blockbook-frontend.nix
|
||||
./services/networking/blocky.nix
|
||||
./services/networking/centrifugo.nix
|
||||
./services/networking/cgit.nix
|
||||
./services/networking/charybdis.nix
|
||||
./services/networking/chisel-server.nix
|
||||
|
@ -467,9 +467,9 @@ in
|
||||
}) cfg.ensureUsers;
|
||||
# `ensurePermissions` is now deprecated, let's avoid it.
|
||||
warnings = lib.optional (any ({ ensurePermissions, ... }: ensurePermissions != {}) cfg.ensureUsers) "
|
||||
`services.postgresql.*.ensurePermissions` is used in your expressions,
|
||||
`services.postgresql.ensureUsers.*.ensurePermissions` is used in your expressions,
|
||||
this option is known to be broken with newer PostgreSQL versions,
|
||||
consider migrating to `services.postgresql.*.ensureDBOwnership` or
|
||||
consider migrating to `services.postgresql.ensureUsers.*.ensureDBOwnership` or
|
||||
consult the release notes or manual for more migration guidelines.
|
||||
|
||||
This option will be removed in NixOS 24.05 unless it sees significant
|
||||
|
123
nixos/modules/services/networking/centrifugo.nix
Normal file
123
nixos/modules/services/networking/centrifugo.nix
Normal file
@ -0,0 +1,123 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.centrifugo;
|
||||
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
|
||||
configFile = settingsFormat.generate "centrifugo.json" cfg.settings;
|
||||
in
|
||||
{
|
||||
options.services.centrifugo = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Centrifugo messaging server");
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "centrifugo" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
default = { };
|
||||
description = lib.mdDoc ''
|
||||
Declarative Centrifugo configuration. See the [Centrifugo
|
||||
documentation] for a list of options.
|
||||
|
||||
[Centrifugo documentation]: https://centrifugal.dev/docs/server/configuration
|
||||
'';
|
||||
};
|
||||
|
||||
credentials = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
default = { };
|
||||
example = {
|
||||
CENTRIFUGO_UNI_GRPC_TLS_KEY = "/run/keys/centrifugo-uni-grpc-tls.key";
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
Environment variables with absolute paths to credentials files to load
|
||||
on service startup.
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFiles = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Files to load environment variables from. Options set via environment
|
||||
variables take precedence over {option}`settings`.
|
||||
|
||||
See the [Centrifugo documentation] for the environment variable name
|
||||
format.
|
||||
|
||||
[Centrifugo documentation]: https://centrifugal.dev/docs/server/configuration#os-environment-variables
|
||||
'';
|
||||
};
|
||||
|
||||
extraGroups = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [ "redis-centrifugo" ];
|
||||
description = lib.mdDoc ''
|
||||
Additional groups for the systemd service.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.centrifugo = {
|
||||
description = "Centrifugo messaging server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
|
||||
ExecStartPre = "${lib.getExe cfg.package} checkconfig --config ${configFile}";
|
||||
ExecStart = "${lib.getExe cfg.package} --config ${configFile}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
|
||||
Restart = "always";
|
||||
RestartSec = "1s";
|
||||
|
||||
# Copy files to the credentials directory with file name being the
|
||||
# environment variable name. Note that "%d" specifier expands to the
|
||||
# path of the credentials directory.
|
||||
LoadCredential = lib.mapAttrsToList (name: value: "${name}:${value}") cfg.credentials;
|
||||
Environment = lib.mapAttrsToList (name: _: "${name}=%d/${name}") cfg.credentials;
|
||||
|
||||
EnvironmentFile = cfg.environmentFiles;
|
||||
|
||||
SupplementaryGroups = cfg.extraGroups;
|
||||
|
||||
DynamicUser = true;
|
||||
UMask = "0077";
|
||||
|
||||
ProtectHome = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectHostname = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
PrivateUsers = true;
|
||||
PrivateDevices = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
DeviceAllow = [ "" ];
|
||||
DevicePolicy = "closed";
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
MemoryDenyWriteExecute = true;
|
||||
LockPersonality = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -301,6 +301,7 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.nixos-firewall-tool ];
|
||||
networking.firewall.checkReversePath = mkIf (!kernelHasRPFilter) (mkDefault false);
|
||||
|
||||
systemd.services.firewall = {
|
||||
|
@ -6,7 +6,7 @@ let
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = [ maintainers.rizary ];
|
||||
maintainers = [ maintainers.rizary maintainers.zimbatm ];
|
||||
};
|
||||
options = {
|
||||
services.nar-serve = {
|
||||
|
@ -174,6 +174,7 @@ in {
|
||||
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
|
||||
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
|
||||
cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; };
|
||||
centrifugo = runTest ./centrifugo.nix;
|
||||
ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix {};
|
||||
ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix {};
|
||||
ceph-single-node-bluestore = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore.nix {};
|
||||
|
80
nixos/tests/centrifugo.nix
Normal file
80
nixos/tests/centrifugo.nix
Normal file
@ -0,0 +1,80 @@
|
||||
let
|
||||
redisPort = 6379;
|
||||
centrifugoPort = 8080;
|
||||
nodes = [
|
||||
"centrifugo1"
|
||||
"centrifugo2"
|
||||
"centrifugo3"
|
||||
];
|
||||
in
|
||||
{ lib, ... }: {
|
||||
name = "centrifugo";
|
||||
meta.maintainers = [ lib.maintainers.tie ];
|
||||
|
||||
nodes = lib.listToAttrs (lib.imap0
|
||||
(index: name: {
|
||||
inherit name;
|
||||
value = { config, ... }: {
|
||||
services.centrifugo = {
|
||||
enable = true;
|
||||
settings = {
|
||||
inherit name;
|
||||
port = centrifugoPort;
|
||||
# See https://centrifugal.dev/docs/server/engines#redis-sharding
|
||||
engine = "redis";
|
||||
# Connect to local Redis shard via Unix socket.
|
||||
redis_address =
|
||||
let
|
||||
otherNodes = lib.take index nodes ++ lib.drop (index + 1) nodes;
|
||||
in
|
||||
map (name: "${name}:${toString redisPort}") otherNodes ++ [
|
||||
"unix://${config.services.redis.servers.centrifugo.unixSocket}"
|
||||
];
|
||||
usage_stats_disable = true;
|
||||
api_insecure = true;
|
||||
};
|
||||
extraGroups = [
|
||||
config.services.redis.servers.centrifugo.user
|
||||
];
|
||||
};
|
||||
services.redis.servers.centrifugo = {
|
||||
enable = true;
|
||||
bind = null; # all interfaces
|
||||
port = redisPort;
|
||||
openFirewall = true;
|
||||
settings.protected-mode = false;
|
||||
};
|
||||
};
|
||||
})
|
||||
nodes);
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
|
||||
redisPort = ${toString redisPort}
|
||||
centrifugoPort = ${toString centrifugoPort}
|
||||
|
||||
start_all()
|
||||
|
||||
for machine in machines:
|
||||
machine.wait_for_unit("redis-centrifugo.service")
|
||||
machine.wait_for_open_port(redisPort)
|
||||
|
||||
for machine in machines:
|
||||
machine.wait_for_unit("centrifugo.service")
|
||||
machine.wait_for_open_port(centrifugoPort)
|
||||
|
||||
# See https://centrifugal.dev/docs/server/server_api#info
|
||||
def list_nodes(machine):
|
||||
curl = "curl --fail-with-body --silent"
|
||||
body = "{}"
|
||||
resp = json.loads(machine.succeed(f"{curl} -d '{body}' http://localhost:{centrifugoPort}/api/info"))
|
||||
return resp["result"]["nodes"]
|
||||
machineNames = {m.name for m in machines}
|
||||
for machine in machines:
|
||||
nodes = list_nodes(machine)
|
||||
assert len(nodes) == len(machines)
|
||||
nodeNames = {n['name'] for n in nodes}
|
||||
assert machineNames == nodeNames
|
||||
'';
|
||||
}
|
@ -30,7 +30,7 @@
|
||||
, libid3tag
|
||||
, libopus
|
||||
, libuuid
|
||||
, ffmpeg_4
|
||||
, ffmpeg_6
|
||||
, soundtouch
|
||||
, pcre
|
||||
, portaudio # given up fighting their portaudio.patch?
|
||||
@ -62,13 +62,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audacity";
|
||||
repo = "audacity";
|
||||
rev = "Audacity-${version}";
|
||||
hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M=";
|
||||
hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
ffmpeg_4
|
||||
ffmpeg_6
|
||||
file
|
||||
flac
|
||||
gtk3
|
||||
@ -171,12 +171,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false; # Test fails
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Replace audacity's wrapper, to:
|
||||
# - put it in the right place, it shouldn't be in "$out/audacity"
|
||||
# - Add the ffmpeg dynamic dependency
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
wrapProgram "$out/bin/audacity" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \
|
||||
--suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \
|
||||
--suffix AUDACITY_PATH : "$out/share/audacity"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "cider";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage";
|
||||
sha256 = "sha256-t3kslhb6STPemdBN6fXc8jcPgNrlnGzcAUQ3HAUB7Yw=";
|
||||
sha256 = "sha256-43QmTnFp8raEyZO5NK/UlRM8Ykd0y4iaYlL3MpROmsk=";
|
||||
};
|
||||
|
||||
extraInstallCommands =
|
||||
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://rybczak.net/ncmpcpp/";
|
||||
changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
|
||||
maintainers = with maintainers; [ koral lovek323 ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "ncmpcpp";
|
||||
};
|
||||
|
@ -105,6 +105,6 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ];
|
||||
maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ];
|
||||
};
|
||||
}
|
||||
|
@ -305,12 +305,12 @@ final: prev:
|
||||
|
||||
SchemaStore-nvim = buildVimPlugin {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "357fe900baae09e1a3fcef913e49733d05d1f888";
|
||||
sha256 = "1dk08b9sb825z18zcq3av3wr8c2xk5szakgiis5c25938jw0c1hl";
|
||||
rev = "9fb873af43568464f9a1936fc334dfa3d7a59418";
|
||||
sha256 = "0w81xzrvjcwp5a6glyk3dcmghvbb4amlhxbbl71lz9k9w0dzcwac";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
@ -522,12 +522,12 @@ final: prev:
|
||||
|
||||
aerial-nvim = buildVimPlugin {
|
||||
pname = "aerial.nvim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "aerial.nvim";
|
||||
rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2";
|
||||
sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8";
|
||||
rev = "d82a994d66a9c6c700f240498304bd6d68fb33f0";
|
||||
sha256 = "0rjndafp4nz0qbaf614q92zkqcsqmr9i2v1c32q8cm1hxkapaf6q";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||
@ -583,12 +583,12 @@ final: prev:
|
||||
|
||||
ale = buildVimPlugin {
|
||||
pname = "ale";
|
||||
version = "2023-11-08";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "50e237facda4b9c3761c3f3e9df185cfdf3d91e8";
|
||||
sha256 = "1iyxw4j499qwwhygwqspsq5573smrd1rcnyh74vk0sj058d3l03y";
|
||||
rev = "1ccd99e113324602b4eca41fd24ba6f991e8f05d";
|
||||
sha256 = "09cmg0w967f9x04g686w9s31yz9jx1qg7rb0jibdjv7khyl1cvqs";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
@ -2119,12 +2119,12 @@ final: prev:
|
||||
|
||||
command-t = buildVimPlugin {
|
||||
pname = "command-t";
|
||||
version = "2023-10-15";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wincent";
|
||||
repo = "command-t";
|
||||
rev = "a2ff356633bfc2b4638925eee172d43173420d3b";
|
||||
sha256 = "1pi4jgc8h48gqdik5kzvlvswh9y9f8rbz6hchng5n5ybnsf3w88a";
|
||||
rev = "b8bcea8d40866bfa33a7f7b24979781039bfc76f";
|
||||
sha256 = "1jiqpgz31whbplv1hs10y8ais5vgya8sz86ahfrbj4c3w34sxvry";
|
||||
};
|
||||
meta.homepage = "https://github.com/wincent/command-t/";
|
||||
};
|
||||
@ -2287,12 +2287,12 @@ final: prev:
|
||||
|
||||
conform-nvim = buildVimPlugin {
|
||||
pname = "conform.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stevearc";
|
||||
repo = "conform.nvim";
|
||||
rev = "4524a687107c6e598017dc7356b7cd1eb046aa71";
|
||||
sha256 = "02waplka03ghpxhwsgjf0z4iv6dqkcrg2whlha334982q57gml1w";
|
||||
rev = "a36c68d2cd551e49883ddb2492c178d915567f58";
|
||||
sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/stevearc/conform.nvim/";
|
||||
@ -2444,12 +2444,12 @@ final: prev:
|
||||
|
||||
crates-nvim = buildVimPlugin {
|
||||
pname = "crates.nvim";
|
||||
version = "2023-11-10";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485";
|
||||
sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5";
|
||||
rev = "406295abeb7eedae3bcee3f0db690ada605c629c";
|
||||
sha256 = "1kiw5vkx3kqd5niyjnpimihd0cb5w8fz8pyq6sfh5am7ycvg5nfj";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
@ -3046,12 +3046,12 @@ final: prev:
|
||||
|
||||
dropbar-nvim = buildVimPlugin {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "c8a209ee319bb93e41e4daebc02eb1614409c350";
|
||||
sha256 = "16kcqjzi68mmfic13jagv2glnlg9jg63n8ywixn60c9h8cd83gk5";
|
||||
rev = "d308748aa5ea44e9df35d2f5333cd2de148fcf3c";
|
||||
sha256 = "0zymllwlf4kvrg3ns9ygsxj44z3yvvcdb8srigx2ffhjgqnri0kw";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
@ -3131,12 +3131,12 @@ final: prev:
|
||||
|
||||
efmls-configs-nvim = buildVimPlugin {
|
||||
pname = "efmls-configs-nvim";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "creativenull";
|
||||
repo = "efmls-configs-nvim";
|
||||
rev = "9bc2196b24a38ebaa16fab25d63caa38565410f3";
|
||||
sha256 = "0pnmk7zgbqhxcnwby7x3s1ryb0wx53m2i9ifv5lc1yf7ns71kcz9";
|
||||
rev = "ed7bd2581318aebc409f54fa4756023d2e6fb7d6";
|
||||
sha256 = "1pbq011s78pq2agjy7gkqkzn9zr5slnik1m5h8mplz9bb28pjb0a";
|
||||
};
|
||||
meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
|
||||
};
|
||||
@ -3300,12 +3300,12 @@ final: prev:
|
||||
|
||||
feline-nvim = buildVimPlugin {
|
||||
pname = "feline.nvim";
|
||||
version = "2023-11-07";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "freddiehaddad";
|
||||
repo = "feline.nvim";
|
||||
rev = "62a9f4fd4fcf46cb87b7868323a1e9aef5b08028";
|
||||
sha256 = "19bhhdkqx24jyz1xc7v39563gqa7y8y2aai4pgl7n5mbrvcr9bsy";
|
||||
rev = "8bfa1a88d19d86756ef468ad2e499e0337084317";
|
||||
sha256 = "190rf7v70jchjj4vrg7sf8ish99kf9n3jqkb009hd8kv68j65lpd";
|
||||
};
|
||||
meta.homepage = "https://github.com/freddiehaddad/feline.nvim/";
|
||||
};
|
||||
@ -3637,12 +3637,12 @@ final: prev:
|
||||
|
||||
fzf-lua = buildVimPlugin {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "03d8c35bf7b0541a877348cefc486dcd02142ec7";
|
||||
sha256 = "024cf9f73f90qfhcr3iqpcwwbxgm1k6a3hn7nl6ndci7mfbc4xc1";
|
||||
rev = "640d6415baf6b12c20c16fdd177f106c5575d6c1";
|
||||
sha256 = "1yrqa1zj6jyf3r6cb6s06mxk6fb4wwdzw08x454f9amw93cah25m";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
@ -3805,12 +3805,12 @@ final: prev:
|
||||
|
||||
gitsigns-nvim = buildNeovimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-10-26";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "af0f583cd35286dd6f0e3ed52622728703237e50";
|
||||
sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86";
|
||||
rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55";
|
||||
sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
@ -4045,12 +4045,12 @@ final: prev:
|
||||
|
||||
hardtime-nvim = buildVimPlugin {
|
||||
pname = "hardtime.nvim";
|
||||
version = "2023-10-27";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "m4xshen";
|
||||
repo = "hardtime.nvim";
|
||||
rev = "8cc4dec29a177cb7c33a900ccf45b451684c30a0";
|
||||
sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k";
|
||||
rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5";
|
||||
sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4";
|
||||
};
|
||||
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
|
||||
};
|
||||
@ -4080,12 +4080,12 @@ final: prev:
|
||||
|
||||
haskell-tools-nvim = buildNeovimPlugin {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "haskell-tools.nvim";
|
||||
rev = "dc778953e98bf2667424d93dad82eefe319e0f7d";
|
||||
sha256 = "18qc0xcdzg914bis9djz1gd7csalqzvlqbv2nd7v02pm0gnw7fbj";
|
||||
rev = "88c3ddac1885f3ee0e9b4664296b10d30a04c731";
|
||||
sha256 = "159rr16jic7cwc6ai539a8gvzjr2klnmhdyyp0c8nr0jl298y3cj";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
||||
};
|
||||
@ -4271,12 +4271,12 @@ final: prev:
|
||||
|
||||
hover-nvim = buildVimPlugin {
|
||||
pname = "hover.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "hover.nvim";
|
||||
rev = "db0acd3a3445b26948e754dbb35a4ede10c31d30";
|
||||
sha256 = "16rph1lwqz4i78qz30l59kwzkndcsfpcc5dzcpw5rzlhq1zqcssy";
|
||||
rev = "cf58d40c90a36c2b2ec6629e84bee9617a7a31c6";
|
||||
sha256 = "0dxyvf6yrdvl0hhnwzsa9im20r100kr4dsvrfa7djbib1n8qvy65";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/hover.nvim/";
|
||||
};
|
||||
@ -4355,12 +4355,12 @@ final: prev:
|
||||
|
||||
image-nvim = buildVimPlugin {
|
||||
pname = "image.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "3rd";
|
||||
repo = "image.nvim";
|
||||
rev = "4c1c903268b42a5b83caf229ddda7014a6a2e0bd";
|
||||
sha256 = "0q6315nx7dailivvncvg1hiwjk910djcwjm5arqd0nq7099d998p";
|
||||
rev = "2a4975130a39d9317595bb356b2ff5663f7d8a77";
|
||||
sha256 = "1r785mgavpc54lr9220n80mp8x90j20snwzicp80ahn407vs10n0";
|
||||
};
|
||||
meta.homepage = "https://github.com/3rd/image.nvim/";
|
||||
};
|
||||
@ -4812,12 +4812,12 @@ final: prev:
|
||||
|
||||
lean-nvim = buildVimPlugin {
|
||||
pname = "lean.nvim";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "2c896afc38b1e1d39118318d581850e2d3ad8e7f";
|
||||
sha256 = "1n9f4hhi55imk53hzzxsypxvsymg3avj9xnsxgr1bl12xyjbm9gk";
|
||||
rev = "47ff75ce2fcc319fe7d8e031bc42a75473919b93";
|
||||
sha256 = "17ab2q4xq1phhn2pxci0qjib1fjr5yl9lqpwf2sy49plhg7ix4zp";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
@ -5231,12 +5231,12 @@ final: prev:
|
||||
|
||||
lsp_signature-nvim = buildVimPlugin {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab";
|
||||
sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs";
|
||||
rev = "8055851d16831370f5249c30a04f2eafcb0b76d3";
|
||||
sha256 = "0dk9r44i9anrjs84s1139vcxmfpw006cqbblis8lhbmwa7m6vhkp";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
@ -5267,12 +5267,12 @@ final: prev:
|
||||
|
||||
lspsaga-nvim = buildVimPlugin {
|
||||
pname = "lspsaga.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "4d85d4ad3ef6ba9ad0fffe478f834c29b5bfa57c";
|
||||
sha256 = "07jpv90i1xrns6hy77pbyilrxh7ad8i1h0x2x0w6mmv395gysxvy";
|
||||
rev = "424503af246033f177a11c9959424bbb3640f077";
|
||||
sha256 = "1ykncpyd7yf73clxifcjsm1lvsy8mzy84j5z203gpl2zwpcnn1sc";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
@ -5424,12 +5424,12 @@ final: prev:
|
||||
|
||||
mason-lspconfig-nvim = buildVimPlugin {
|
||||
pname = "mason-lspconfig.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason-lspconfig.nvim";
|
||||
rev = "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84";
|
||||
sha256 = "1kq88b7q8kskigpizk432h4r5gf8k87f3zrnxz2pyvrwwg7vpkmp";
|
||||
rev = "ab640b38ca9fa50d25d2d249b6606b9456b628d5";
|
||||
sha256 = "16lc26ypiq29jnmxdqhvlj30q1lbfin89cdahchils8fir6pn3sg";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
|
||||
};
|
||||
@ -5472,12 +5472,12 @@ final: prev:
|
||||
|
||||
material-nvim = buildVimPlugin {
|
||||
pname = "material.nvim";
|
||||
version = "2023-11-02";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marko-cerovac";
|
||||
repo = "material.nvim";
|
||||
rev = "eb52634ec1f6cc186f85640ae4bf3ee80bb10551";
|
||||
sha256 = "1lb58jxkz2kzf0zqbba3znxckadi09yna9lmyq3my59xzkaqa7p4";
|
||||
rev = "a74108b417cff78d15074f6f68a8f997e718f404";
|
||||
sha256 = "1vfndgk09kvrwj3kviff4c8wsi8gd7pym5wg0r17jflmqr7y2y5m";
|
||||
};
|
||||
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
|
||||
};
|
||||
@ -5544,12 +5544,12 @@ final: prev:
|
||||
|
||||
mini-nvim = buildVimPlugin {
|
||||
pname = "mini.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "abd7aa3ec50350ec3c986fcdd7328e3d23948b89";
|
||||
sha256 = "188dqyddsj2rzz212n8kswxqn8mxa0n38j681r912z4yf4vbmjqi";
|
||||
rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9";
|
||||
sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
@ -5628,12 +5628,12 @@ final: prev:
|
||||
|
||||
molten-nvim = buildVimPlugin {
|
||||
pname = "molten-nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "benlubas";
|
||||
repo = "molten-nvim";
|
||||
rev = "91ec70b710bc8e1de59352b1ecfb4cdb6e786c92";
|
||||
sha256 = "0h3xg8n5asya98lyly8m2zgkkg1llxji3fx6fd4i6yym42c3awv0";
|
||||
rev = "413d0eab0d37d770759b4e2aba9205182fa796da";
|
||||
sha256 = "0xaxiqdf99901fpwv7h4a03k7qfqdnr9rfmrj1yx6rcai2yiwxyc";
|
||||
};
|
||||
meta.homepage = "https://github.com/benlubas/molten-nvim/";
|
||||
};
|
||||
@ -5688,12 +5688,12 @@ final: prev:
|
||||
|
||||
nabla-nvim = buildVimPlugin {
|
||||
pname = "nabla.nvim";
|
||||
version = "2023-04-22";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbyuki";
|
||||
repo = "nabla.nvim";
|
||||
rev = "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e";
|
||||
sha256 = "17iw6ca9b8mrw68f4zkghnf3if76yrpj5fn8cp8829zpm722l6b1";
|
||||
rev = "f5aff14fa3d60f4be568c444be84400812823648";
|
||||
sha256 = "0ynqz7hmbxswxlnw411ah6n1bsd6saq8l5s8lrmbfas91zm5hy0x";
|
||||
};
|
||||
meta.homepage = "https://github.com/jbyuki/nabla.nvim/";
|
||||
};
|
||||
@ -5940,12 +5940,12 @@ final: prev:
|
||||
|
||||
neo-tree-nvim = buildVimPlugin {
|
||||
pname = "neo-tree.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neo-tree";
|
||||
repo = "neo-tree.nvim";
|
||||
rev = "f86e871584bd3c5a00b4ff8344305889eb52ebff";
|
||||
sha256 = "16v172gmr3clr8mnw1v767ln6qidalp7qv6xsh10ylnkzygz9lin";
|
||||
rev = "230ff118613fa07138ba579b89d13ec2201530b9";
|
||||
sha256 = "13ma0zh6jbh8dbinczbanwf1jy20sac9qxx7v9h174gbyzpc079m";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
|
||||
};
|
||||
@ -5988,12 +5988,12 @@ final: prev:
|
||||
|
||||
neodev-nvim = buildVimPlugin {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "b2881eeb395d2b268de5fe9b5e201a8f1816beb8";
|
||||
sha256 = "02wnkbcvcpsz6dy855c1c8l0cz7178qaqddvmmgqfpzi1dfxn4q9";
|
||||
rev = "627b5b543f4df551fcddb99c17a8e260c453400d";
|
||||
sha256 = "0b3cv7w6ic9wbfnr11p0f1dnfzpwlnx10lw6wyhlfg8mwx8dvksb";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
@ -6024,12 +6024,12 @@ final: prev:
|
||||
|
||||
neogit = buildVimPlugin {
|
||||
pname = "neogit";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "296570589180d9428539f5ac099d7c8b9f4ad489";
|
||||
sha256 = "10b9jl17kb6lnlhgm7lblf08qh3q8ymhzzv7w1p4hz786hrcgi53";
|
||||
rev = "987e415247547a372d0356f76444cf402436c727";
|
||||
sha256 = "00ppnr40s8lhlvga1m87xgwrdnyzj6as4522jl0n31lx7f90bvpm";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
};
|
||||
@ -6096,12 +6096,12 @@ final: prev:
|
||||
|
||||
neorg = buildVimPlugin {
|
||||
pname = "neorg";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "d5f3ad064918cf19dbbdfa77817d162d4de6a461";
|
||||
sha256 = "1qaghcfmnyv8hcmnbdrz12x6m92lxl9n3mxbf6vqmqi9ivdr63h1";
|
||||
rev = "095fad9481f5a678625a99dc06e9991c5d11efc8";
|
||||
sha256 = "1wqdhyr4z377y2gjlc4vg0v9wnnxwyxbcj5ahmihj1nfwrj1l7pa";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
@ -6241,12 +6241,12 @@ final: prev:
|
||||
|
||||
neotest-haskell = buildVimPlugin {
|
||||
pname = "neotest-haskell";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "neotest-haskell";
|
||||
rev = "d0d9fa025056d4a8124e7bf34a3b0b7942870c84";
|
||||
sha256 = "1f4w2lyjj19piw0pn9456ilnw4g7086641z73f6msvy6fnxggp6l";
|
||||
rev = "9bb7981e4753daaf705350b3d98305a488b82dff";
|
||||
sha256 = "1q229xqsv9in0n78hpi0sj6apqyzs9iqbhwnh57swd0v4x85ync6";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
||||
};
|
||||
@ -6601,12 +6601,12 @@ final: prev:
|
||||
|
||||
none-ls-nvim = buildVimPlugin {
|
||||
pname = "none-ls.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimtools";
|
||||
repo = "none-ls.nvim";
|
||||
rev = "e5abf91b410e28e823b26fe9141287fb416d2dee";
|
||||
sha256 = "1bx8aan45sipqpg0yh4idagqhgn085dnnzgb051jzdwd6ja0hisv";
|
||||
rev = "fa9be1679db7bf57d44128a018db43da5488a07f";
|
||||
sha256 = "0cqmdkxksridq4qgdfjcvinqq274lqidpblgijv5iqa14zzng0b0";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
|
||||
};
|
||||
@ -6937,12 +6937,12 @@ final: prev:
|
||||
|
||||
nvim-dap = buildVimPlugin {
|
||||
pname = "nvim-dap";
|
||||
version = "2023-11-08";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "9d81c11fd185a131f81841e64941859305f6c42d";
|
||||
sha256 = "1pwn5c0hjm3wpzzybbakxgpq4bd7f6aygvslhivi4inzn48dla90";
|
||||
rev = "e154fdb6d70b3765d71f296e718b29d8b7026a63";
|
||||
sha256 = "156hp1i8vm0fpy5vbcx0ihazblnly72vjsiy8bf9f30i9rvq9knv";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
@ -7188,12 +7188,12 @@ final: prev:
|
||||
|
||||
nvim-lint = buildVimPlugin {
|
||||
pname = "nvim-lint";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-lint";
|
||||
rev = "4f2d968a827d86bb40b7b1fad28c11f7b764fef3";
|
||||
sha256 = "0i60lyzhhnpzxi7k5dy4xacsg8mmc7ac8f8xwlbv32h8jqrblsab";
|
||||
rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39";
|
||||
sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||
};
|
||||
@ -7224,12 +7224,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPlugin {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "d5d7412ff267b92a11a94e6559d5507c43670a52";
|
||||
sha256 = "1jqpsj2in41fv148zdvddpcwjzmll5kchzx9mnbas685xmzc4h0k";
|
||||
rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43";
|
||||
sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -7284,12 +7284,12 @@ final: prev:
|
||||
|
||||
nvim-metals = buildVimPlugin {
|
||||
pname = "nvim-metals";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scalameta";
|
||||
repo = "nvim-metals";
|
||||
rev = "96d0c8ded6c2b9e66340c1e00d5a62acec112711";
|
||||
sha256 = "1ml08is8vn49d7bbzlhfdxfa6q8c9hjnfxrsaxqbgkhgnw7nakq5";
|
||||
rev = "a3a75d094cc880dcd1fd9745fea2f0cd84662110";
|
||||
sha256 = "0zjlcsmz3381ir4sl2n7r2b91d7x5hp12g03v27y381p9q5kg41y";
|
||||
};
|
||||
meta.homepage = "https://github.com/scalameta/nvim-metals/";
|
||||
};
|
||||
@ -7404,12 +7404,12 @@ final: prev:
|
||||
|
||||
nvim-pqf = buildVimPlugin {
|
||||
pname = "nvim-pqf";
|
||||
version = "2023-10-27";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yorickpeterse";
|
||||
repo = "nvim-pqf";
|
||||
rev = "3f4f176a6dd50c8588cfbe1b0e9cbea39018003e";
|
||||
sha256 = "11mrgrdhcqsw1xg9pldby8gp0wpkmbcf9c9nbahxd73s77b5a0b4";
|
||||
rev = "ba0e291cb5c0249838132e197dac082777bdc7d6";
|
||||
sha256 = "079w1n62dr8fyn3c6594dgvm5546c2lmaka4bqb1dxkmw9pfqfa1";
|
||||
};
|
||||
meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
|
||||
};
|
||||
@ -7452,12 +7452,12 @@ final: prev:
|
||||
|
||||
nvim-scrollview = buildVimPlugin {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "642068c7d6d98e019a3e1db7c7b4876373347730";
|
||||
sha256 = "1zi3kvyxb3zyni5dj9kmi296r303bskpcdmsi3a4r9a3pryl4lhr";
|
||||
rev = "74ab63b598cca206888e83090ed6312aac324b4c";
|
||||
sha256 = "0habi91wq7q6i49x20ipli9kd84iflpz0wb2lfwnmhii1dfvmifh";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
@ -7572,36 +7572,36 @@ final: prev:
|
||||
|
||||
nvim-tree-lua = buildVimPlugin {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "80cfeadf179d5cba76f0f502c71dbcff1b515cd8";
|
||||
sha256 = "0fmmfhzl8igk3kpk34cs0wvw4lyhjvc83cdk225gs06awqr24i3m";
|
||||
rev = "46e1f776f0a714099b9160604fbb62fba2540376";
|
||||
sha256 = "1c3i4hzr68izlk3r4lain0v1kqh1l078gc8bf8mj7vgwa67mplj0";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPlugin {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "8b9f99660294dcd11d42572c84ee33a1e284f70d";
|
||||
sha256 = "09mkkkirp922018dvci32p9mfsa2fqkv9b6nd1srwicxydx1wzp7";
|
||||
rev = "d87629647614b779fb2aad8f0042fe2864253ea6";
|
||||
sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
||||
nvim-treesitter-context = buildVimPlugin {
|
||||
pname = "nvim-treesitter-context";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-context";
|
||||
rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977";
|
||||
sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv";
|
||||
rev = "f3ec0d8a1b4e07d7ed2da6b9a9f10864a83c4be4";
|
||||
sha256 = "1kbx404z9ziy2ylj9qkmrdkhb4mjhvijnrb29hdbjh1hymhghxzp";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
|
||||
};
|
||||
@ -7680,12 +7680,12 @@ final: prev:
|
||||
|
||||
nvim-ts-context-commentstring = buildVimPlugin {
|
||||
pname = "nvim-ts-context-commentstring";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joosepalviste";
|
||||
repo = "nvim-ts-context-commentstring";
|
||||
rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d";
|
||||
sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s";
|
||||
rev = "ead792ccdace6a9d64a8119909af243ed0105465";
|
||||
sha256 = "0s55gcdh6yi0mpszqaj10sm25nk6wichli6zavs7ywg29nfxl3h8";
|
||||
};
|
||||
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
|
||||
};
|
||||
@ -7739,12 +7739,12 @@ final: prev:
|
||||
|
||||
nvim-web-devicons = buildVimPlugin {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2023-11-13";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "11eb26fc166742db8d1e8a6f5a7de9df37b09aae";
|
||||
sha256 = "0xshsc1wxgsvdb09klsddz0ipf43vimsya4rc4zi22xxjgj40dyh";
|
||||
rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4";
|
||||
sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
|
||||
};
|
||||
@ -7920,12 +7920,12 @@ final: prev:
|
||||
|
||||
onedarkpro-nvim = buildVimPlugin {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "89888840309a813ef6911e0150a0c6aa66c2ab5c";
|
||||
sha256 = "0648dilrk31yn2c8s581c62j9jk30cnxf6h4f2pcddygs308pqn8";
|
||||
rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea";
|
||||
sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
@ -8439,12 +8439,12 @@ final: prev:
|
||||
|
||||
quarto-nvim = buildVimPlugin {
|
||||
pname = "quarto-nvim";
|
||||
version = "2023-10-17";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "quarto-dev";
|
||||
repo = "quarto-nvim";
|
||||
rev = "14a80ffab90567e360eb97b19039c4c16913ad79";
|
||||
sha256 = "1ak24ydzrak1al1nf6kdfjivlfh03hsyibyf7x1gnzwgm35i1v4a";
|
||||
rev = "4e9910b1c4cbd49d8ccd001e7a59b700c57cd71b";
|
||||
sha256 = "170d89xh104fzcmnd8az65jvdr2bs3lyaqw8icpbav7vfi7d099a";
|
||||
};
|
||||
meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
|
||||
};
|
||||
@ -8511,11 +8511,11 @@ final: prev:
|
||||
|
||||
rainbow-delimiters-nvim = buildVimPlugin {
|
||||
pname = "rainbow-delimiters.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
||||
rev = "ffb31befabb165812360ba70072e04c2101317d7";
|
||||
sha256 = "1a4gwggn131zyiigv7zvpbriqs2f2z7kslds9xpc6rgskd873kkd";
|
||||
rev = "072210357169394dff90d30ccfe0ac92530a9317";
|
||||
sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
||||
};
|
||||
@ -8762,12 +8762,12 @@ final: prev:
|
||||
|
||||
rustaceanvim = buildNeovimPlugin {
|
||||
pname = "rustaceanvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrcjkb";
|
||||
repo = "rustaceanvim";
|
||||
rev = "3f0217642bbcb4179772c2bfd124fb808371be2e";
|
||||
sha256 = "0lqvggbrfmf96cz6q2jjdic67m9j7ap65va7j0z4jm2rfndany70";
|
||||
rev = "540ff82e5f47f3e39bd583acfbd813f4ac90d4a6";
|
||||
sha256 = "096i4rrs2yjrhixwzcwh9ppiq5cjdvn3in6b0m4qh9wk3i0kxrvx";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
|
||||
};
|
||||
@ -8954,12 +8954,12 @@ final: prev:
|
||||
|
||||
sideways-vim = buildVimPlugin {
|
||||
pname = "sideways.vim";
|
||||
version = "2023-02-25";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "sideways.vim";
|
||||
rev = "eb7f35f6a652f60d3b4f262d64d4846adbd4d104";
|
||||
sha256 = "0n3n80sq9kxamih47q1z6lsbh7adic612cklikva379kqygmvdlj";
|
||||
rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b";
|
||||
sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
|
||||
@ -9051,12 +9051,12 @@ final: prev:
|
||||
|
||||
snap = buildVimPlugin {
|
||||
pname = "snap";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "camspiers";
|
||||
repo = "snap";
|
||||
rev = "e00e423a5cc4637fdcea79435086736f6ae85182";
|
||||
sha256 = "06hviy2f6jawhdcjfhd5hkkjwsj0bnaz5cvmf76chccqr24851cw";
|
||||
rev = "149ad2d3c297a11135322d00a2a3cef35911b278";
|
||||
sha256 = "1lkcid96ngaw1yyyin639x1icybd97g7016m9n4y2xrmkdbx32h4";
|
||||
};
|
||||
meta.homepage = "https://github.com/camspiers/snap/";
|
||||
};
|
||||
@ -9219,12 +9219,12 @@ final: prev:
|
||||
|
||||
splitjoin-vim = buildVimPlugin {
|
||||
pname = "splitjoin.vim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "splitjoin.vim";
|
||||
rev = "8b00772a03c416d23954baeff8a32154bb626293";
|
||||
sha256 = "0anb7bh08n4aj6x04v3ys35sl6b4f1lc7026b3pc3i6yjivnq9k8";
|
||||
rev = "9531bfb26257f0d06f7ea2b7ecb4f13095d430ab";
|
||||
sha256 = "0k1gm1qijdwsrpc0rd6b1q71l6gi2hr8sh6nfslah3dgncgpy21d";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
|
||||
@ -9352,12 +9352,12 @@ final: prev:
|
||||
|
||||
substitute-nvim = buildVimPlugin {
|
||||
pname = "substitute.nvim";
|
||||
version = "2023-10-11";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "substitute.nvim";
|
||||
rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610";
|
||||
sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h";
|
||||
rev = "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714";
|
||||
sha256 = "0jf6r6zxgr4709lfl2ry7z8qh4zql8w4x56bqj0jfkga35l9c7c1";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/substitute.nvim/";
|
||||
};
|
||||
@ -9715,12 +9715,12 @@ final: prev:
|
||||
|
||||
telescope-file-browser-nvim = buildVimPlugin {
|
||||
pname = "telescope-file-browser.nvim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-file-browser.nvim";
|
||||
rev = "da2a20ccaf39ce04b92178711a2db175ec0a87d5";
|
||||
sha256 = "1k7sp1xcrr2wlkjrs7aqsnxjf7sp9ra36bpl1rn1dfmjyd949n6r";
|
||||
rev = "f41675fddb1ea9003187d07ecc627a8bf8292633";
|
||||
sha256 = "05qvb1fsnby5c5x5my601lavbk3m9w10dnq6i55yp42ksrk8zjki";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
|
||||
};
|
||||
@ -9896,12 +9896,12 @@ final: prev:
|
||||
|
||||
telescope-undo-nvim = buildVimPlugin {
|
||||
pname = "telescope-undo.nvim";
|
||||
version = "2023-11-12";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "debugloop";
|
||||
repo = "telescope-undo.nvim";
|
||||
rev = "13c33c173e53f14df7eec5155c52a3d2ab022d8d";
|
||||
sha256 = "0bc3c447491pbp6l20gn4kwd9n7wm4ayac0imsvswpmnvlrh0ibn";
|
||||
rev = "d3afc1c105535a90caec092ce27a113f77ba7b84";
|
||||
sha256 = "0cpkjl6pffwdrh1hawpd042gpnyqbg2r8f1nz0fwdk175bgsx2s8";
|
||||
};
|
||||
meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/";
|
||||
};
|
||||
@ -9957,12 +9957,12 @@ final: prev:
|
||||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "721cdcae134eb5c564cb6c9df6c317c3854528ad";
|
||||
sha256 = "12kizqyhknpp4931n2fkbdxhb04afpcnxyw6s4z7mf1vsfjz39w2";
|
||||
rev = "18774ec7929c8a8003a91e9e1f69f6c32258bbfe";
|
||||
sha256 = "1vihb6l5xiqbrs1g4c1blpkd0c995hwv2w6sr5b86zzmk70g0c7k";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
@ -10065,12 +10065,12 @@ final: prev:
|
||||
|
||||
text-case-nvim = buildVimPlugin {
|
||||
pname = "text-case.nvim";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "johmsalas";
|
||||
repo = "text-case.nvim";
|
||||
rev = "acd6178ffcf728c82036c7064630ff40f4c9ae82";
|
||||
sha256 = "03r9znnrgvc374k71wzjyr69ifpmbgpwx9n8xmrv3f0w6kmfa1y1";
|
||||
rev = "65fcc8fb79ceef644af6861558bb534562ef6c0e";
|
||||
sha256 = "12dhchvn9mgs3pndiq6bnjn44ixx3famf5ad3vhhw0h7331p7v9v";
|
||||
};
|
||||
meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
|
||||
};
|
||||
@ -10342,12 +10342,12 @@ final: prev:
|
||||
|
||||
typescript-tools-nvim = buildVimPlugin {
|
||||
pname = "typescript-tools.nvim";
|
||||
version = "2023-10-19";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pmizio";
|
||||
repo = "typescript-tools.nvim";
|
||||
rev = "102ba313f87e1f9f9864f681dd7779cac8f6d3ea";
|
||||
sha256 = "1sadhwdwcdb5qibp4xsw1g3skfgyq6rv86cmlb15ys6r4dv0lyws";
|
||||
rev = "11f50fb66132c0bac929533b64536a8a7c490435";
|
||||
sha256 = "10dw4v8z8akgbp745f4ir0jnspxa1lji7adpgqa9fvkw78yws1n1";
|
||||
};
|
||||
meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/";
|
||||
};
|
||||
@ -10426,12 +10426,12 @@ final: prev:
|
||||
|
||||
unison = buildVimPlugin {
|
||||
pname = "unison";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "68d6f93d3bdd3663aee6ec7e16fee4eedc6df26b";
|
||||
sha256 = "1kb2dnd5jcwig3yjajjwznmb47llrl5y5jmd33nkdrrmvckb6l0z";
|
||||
rev = "fe51253418442af7c5e5884e084bdc574b5be5fb";
|
||||
sha256 = "12zpkskk81nagai3rip7ak0k7nz5imj07bphkalchf6lrr464bli";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
@ -10906,12 +10906,12 @@ final: prev:
|
||||
|
||||
vim-alias = buildVimPlugin {
|
||||
pname = "vim-alias";
|
||||
version = "2021-05-25";
|
||||
version = "2023-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Konfekt";
|
||||
repo = "vim-alias";
|
||||
rev = "9d1a86284c223fad488137075867ba1c1bd20599";
|
||||
sha256 = "1fqa39j3ax7cvj7bn33r545zwbplmf4b6n7z5jgqqn8h03hsq7x1";
|
||||
rev = "4fb8430816ecd12952c44bf1891ec554249f21b3";
|
||||
sha256 = "0919drb2ml1xfm3y2g9nvqh6l3n2hjmsbrw6g72lgqh7l02xlalz";
|
||||
};
|
||||
meta.homepage = "https://github.com/Konfekt/vim-alias/";
|
||||
};
|
||||
@ -11590,12 +11590,12 @@ final: prev:
|
||||
|
||||
vim-dadbod-completion = buildVimPlugin {
|
||||
pname = "vim-dadbod-completion";
|
||||
version = "2023-10-15";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristijanhusak";
|
||||
repo = "vim-dadbod-completion";
|
||||
rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569";
|
||||
sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z";
|
||||
rev = "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2";
|
||||
sha256 = "07shhzgg5f4zci1md5gmns0h4xq3hxvak4c78glm807kcw22rj70";
|
||||
};
|
||||
meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
|
||||
};
|
||||
@ -12876,12 +12876,12 @@ final: prev:
|
||||
|
||||
vim-just = buildVimPlugin {
|
||||
pname = "vim-just";
|
||||
version = "2023-11-14";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoahTheDuke";
|
||||
repo = "vim-just";
|
||||
rev = "8fa4691bc3b593b6deaf885a3af80aafb12f338b";
|
||||
sha256 = "0gic7vfd3jbz5pwn0cchhx4xs05vil590mc90kfkvf97ksr94965";
|
||||
rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a";
|
||||
sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph";
|
||||
};
|
||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||
};
|
||||
@ -15242,12 +15242,12 @@ final: prev:
|
||||
|
||||
vim-wakatime = buildVimPlugin {
|
||||
pname = "vim-wakatime";
|
||||
version = "2023-11-02";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "vim-wakatime";
|
||||
rev = "3c6c5bf17f4ae6c53396667ce3405df02a80b894";
|
||||
sha256 = "0n8db9y20fmm4zngmhpnr3pcpjrm78071mmq96wx1nfgn544hsld";
|
||||
rev = "87c6861ea81700ec4a6a27c81413cf07cb2c883c";
|
||||
sha256 = "0j2rnrz2cx0zsvqbx4glpdij89nbxwq6iyb385jvv7lhm4fyary8";
|
||||
};
|
||||
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
|
||||
};
|
||||
@ -16024,12 +16024,12 @@ final: prev:
|
||||
|
||||
catppuccin-nvim = buildVimPlugin {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2023-11-15";
|
||||
version = "2023-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "cc717acba29259d578548973c41448b092453c52";
|
||||
sha256 = "1jbyvd5w06hppwpvjm2sd01qz3phw7ds5n7w220x8r2vslpmm25l";
|
||||
rev = "a8dfb969e76d1a0752d98b5347be9ffb9bca9592";
|
||||
sha256 = "07xmcvb06w4khjc2z8h3i1c63fhkk4d76xjzwxs8lhzwfm4w3n86";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
|
@ -27,12 +27,12 @@
|
||||
};
|
||||
apex = buildGrammar {
|
||||
language = "apex";
|
||||
version = "0.0.0+rev=a768c95";
|
||||
version = "0.0.0+rev=82ee140";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
|
||||
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
|
||||
rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7";
|
||||
hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk=";
|
||||
};
|
||||
location = "apex";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
@ -160,12 +160,12 @@
|
||||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=25371f9";
|
||||
version = "0.0.0+rev=212a80f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c";
|
||||
rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f";
|
||||
hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc=";
|
||||
rev = "212a80f86452bb1316324fa0db730cf52f29e05a";
|
||||
hash = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
|
||||
};
|
||||
@ -292,12 +292,12 @@
|
||||
};
|
||||
cpp = buildGrammar {
|
||||
language = "cpp";
|
||||
version = "0.0.0+rev=d153fe1";
|
||||
version = "0.0.0+rev=a714740";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-cpp";
|
||||
rev = "d153fe1c3385ee0521730ff4e0be9358e903b322";
|
||||
hash = "sha256-zxAz82XpTtKondA84L1sO3VByo8vLI4j154pWbxlV74=";
|
||||
rev = "a71474021410973b29bfe99440d57bcd750246b1";
|
||||
hash = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
|
||||
};
|
||||
@ -326,12 +326,12 @@
|
||||
};
|
||||
cuda = buildGrammar {
|
||||
language = "cuda";
|
||||
version = "0.0.0+rev=3161aed";
|
||||
version = "0.0.0+rev=d33ee2c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-cuda";
|
||||
rev = "3161aed045130c900f870ef53fad93a574317769";
|
||||
hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw=";
|
||||
rev = "d33ee2caab572f7b46cef12e090331b9ed1c02e2";
|
||||
hash = "sha256-9fQ0z7DozjGdcQZG36w419mFXIVDeafkG+ciQHgh0EE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
|
||||
};
|
||||
@ -736,12 +736,12 @@
|
||||
};
|
||||
glsl = buildGrammar {
|
||||
language = "glsl";
|
||||
version = "0.0.0+rev=bea82d3";
|
||||
version = "0.0.0+rev=c9082ed";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-glsl";
|
||||
rev = "bea82d337801e472e35b5cd08038afdf13263768";
|
||||
hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE=";
|
||||
rev = "c9082edab87b145e97090b133167cb53626d9f58";
|
||||
hash = "sha256-bwuPykagBFfTJ87C5oNcUWmKs9eBBYPZ0UOC/8zbbF8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
|
||||
};
|
||||
@ -901,12 +901,12 @@
|
||||
};
|
||||
hcl = buildGrammar {
|
||||
language = "hcl";
|
||||
version = "0.0.0+rev=fdf6463";
|
||||
version = "0.0.0+rev=e135399";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-hcl";
|
||||
rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51";
|
||||
hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E=";
|
||||
rev = "e135399cb31b95fac0760b094556d1d5ce84acf0";
|
||||
hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
|
||||
};
|
||||
@ -1229,14 +1229,25 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/r001/tree-sitter-leo";
|
||||
};
|
||||
linkerscript = buildGrammar {
|
||||
language = "linkerscript";
|
||||
version = "0.0.0+rev=f99011a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-linkerscript";
|
||||
rev = "f99011a3554213b654985a4b0a65b3b032ec4621";
|
||||
hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-linkerscript";
|
||||
};
|
||||
liquidsoap = buildGrammar {
|
||||
language = "liquidsoap";
|
||||
version = "0.0.0+rev=b35882f";
|
||||
version = "0.0.0+rev=91d2708";
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "tree-sitter-liquidsoap";
|
||||
rev = "b35882f2e1460867ddddcbe8af586e6807d4676f";
|
||||
hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0=";
|
||||
rev = "91d2708e12a5869154a85190b13ac89cb1414189";
|
||||
hash = "sha256-2wnGHQXx5QHkXSBsxjULIRlbXj7CBxWxFjef3n9lmew=";
|
||||
};
|
||||
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
|
||||
};
|
||||
@ -1611,12 +1622,12 @@
|
||||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=33e3016";
|
||||
version = "0.0.0+rev=0a99dec";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6";
|
||||
hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc=";
|
||||
rev = "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9";
|
||||
hash = "sha256-MfCws6WvaYJPoxoSdk1OUkqfVGCNtfMDTyndSZpABqI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
@ -1766,12 +1777,12 @@
|
||||
};
|
||||
purescript = buildGrammar {
|
||||
language = "purescript";
|
||||
version = "0.0.0+rev=f89bd14";
|
||||
version = "0.0.0+rev=85a9095";
|
||||
src = fetchFromGitHub {
|
||||
owner = "postsolar";
|
||||
repo = "tree-sitter-purescript";
|
||||
rev = "f89bd149e44624342bf49f76245d3284f2beed9a";
|
||||
hash = "sha256-c4Zux+6kg9b9/0t9LOtfSdMMQbp1xwiQH8dz4BBB/pY=";
|
||||
rev = "85a90951c10f118f819c1137f669800246890db7";
|
||||
hash = "sha256-F5xkMYK5WYn+Fuf/vWGaywX+hrjOqGUlg9EjHMS6yDg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/postsolar/tree-sitter-purescript";
|
||||
};
|
||||
@ -1788,12 +1799,12 @@
|
||||
};
|
||||
python = buildGrammar {
|
||||
language = "python";
|
||||
version = "0.0.0+rev=82f5c99";
|
||||
version = "0.0.0+rev=4bfdd90";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-python";
|
||||
rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c";
|
||||
hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk=";
|
||||
rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc";
|
||||
hash = "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
|
||||
};
|
||||
@ -1975,12 +1986,12 @@
|
||||
};
|
||||
rust = buildGrammar {
|
||||
language = "rust";
|
||||
version = "0.0.0+rev=48e0533";
|
||||
version = "0.0.0+rev=79456e6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-rust";
|
||||
rev = "48e053397b587de97790b055a1097b7c8a4ef846";
|
||||
hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk=";
|
||||
rev = "79456e6080f50fc1ca7c21845794308fa5d35a51";
|
||||
hash = "sha256-57CuGp7gP+AVYIR3HbMXnmmSAbtlpWrOHRYpMbmWfds=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
|
||||
};
|
||||
@ -2086,24 +2097,24 @@
|
||||
};
|
||||
soql = buildGrammar {
|
||||
language = "soql";
|
||||
version = "0.0.0+rev=a768c95";
|
||||
version = "0.0.0+rev=82ee140";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
|
||||
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
|
||||
rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7";
|
||||
hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk=";
|
||||
};
|
||||
location = "soql";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
};
|
||||
sosl = buildGrammar {
|
||||
language = "sosl";
|
||||
version = "0.0.0+rev=a768c95";
|
||||
version = "0.0.0+rev=82ee140";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
|
||||
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
|
||||
rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7";
|
||||
hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk=";
|
||||
};
|
||||
location = "sosl";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
@ -2121,12 +2132,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=9fe5aea";
|
||||
version = "0.0.0+rev=d8fffdf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "9fe5aeaa8d58d00cc31c20a3ae923ae695ce2ce7";
|
||||
hash = "sha256-HnSZGrxrHlARPhgTJRO6P0FcmjOdB3c5eMpH9+5ZaX8=";
|
||||
rev = "d8fffdf0902bf55994fd2e8a0a46e221ca988589";
|
||||
hash = "sha256-PowCYtL56lLGJaXFEdtPGAXaqYF0/u/mqDCjXHmyps0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
@ -2143,12 +2154,12 @@
|
||||
};
|
||||
ssh_config = buildGrammar {
|
||||
language = "ssh_config";
|
||||
version = "0.0.0+rev=6ac08de";
|
||||
version = "0.0.0+rev=1651e63";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-ssh-config";
|
||||
rev = "6ac08decae456ef2fc307977d9210f86d75d4eca";
|
||||
hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw=";
|
||||
rev = "1651e637d57c667708add5440d3726f07e97d953";
|
||||
hash = "sha256-jshQhWIeMcsUA7g2RGuH3DSfBfRhRx9dMOJVm/92Jkw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
|
||||
};
|
||||
@ -2243,12 +2254,12 @@
|
||||
};
|
||||
t32 = buildGrammar {
|
||||
language = "t32";
|
||||
version = "0.0.0+rev=884a034";
|
||||
version = "0.0.0+rev=b904af3";
|
||||
src = fetchFromGitLab {
|
||||
owner = "xasc";
|
||||
repo = "tree-sitter-t32";
|
||||
rev = "884a034e0ae29ce72649041a603deacdfb4a3275";
|
||||
hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY=";
|
||||
rev = "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306";
|
||||
hash = "sha256-MGdwcw9T3hemUHfgQmdTp20MW08AQcVWGRHxkP/6N5Y=";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
|
||||
};
|
||||
@ -2275,14 +2286,25 @@
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
|
||||
};
|
||||
templ = buildGrammar {
|
||||
language = "templ";
|
||||
version = "0.0.0+rev=6b9dff6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrischmann";
|
||||
repo = "tree-sitter-templ";
|
||||
rev = "6b9dff614d5bab902cb6989bfcaa180636218159";
|
||||
hash = "sha256-89CJkVuNWm3V3Iz8iCx1pLIJwhyPcEfDB3ZqqiwZEdU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
|
||||
};
|
||||
terraform = buildGrammar {
|
||||
language = "terraform";
|
||||
version = "0.0.0+rev=fdf6463";
|
||||
version = "0.0.0+rev=e135399";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-hcl";
|
||||
rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51";
|
||||
hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E=";
|
||||
rev = "e135399cb31b95fac0760b094556d1d5ce84acf0";
|
||||
hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ=";
|
||||
};
|
||||
location = "dialects/terraform";
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
|
||||
@ -2480,12 +2502,12 @@
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0.0.0+rev=099a85f";
|
||||
version = "0.0.0+rev=2f24b03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v-analyzer";
|
||||
repo = "v-analyzer";
|
||||
rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c";
|
||||
hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc=";
|
||||
rev = "2f24b0377ddb865eb4285634f6945cb4ee3f395c";
|
||||
hash = "sha256-DLtG1RzoDC252O1FItP9vDZyt/MpV4bR7tcMSOLINWA=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/v-analyzer/v-analyzer";
|
||||
@ -2580,12 +2602,12 @@
|
||||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=eacf704";
|
||||
version = "0.0.0+rev=f6423ec";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "eacf704338661b981fcf4fdb5ee44d898f038144";
|
||||
hash = "sha256-JwA49Up2G2/jobjqniQeJ1Rfko3PFfgINRvi/QswlCk=";
|
||||
rev = "f6423ecace1ef34f57dc77db031504ce21ebfaaf";
|
||||
hash = "sha256-uIUIXHxHWedJ5oH1u/88degVAzklzN97AYc5B39nFwE=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
@ -3547,15 +3547,15 @@ let
|
||||
mktplcRef = {
|
||||
name = "uiua-vscode";
|
||||
publisher = "uiua-lang";
|
||||
version = "0.0.23";
|
||||
sha256 = "sha256-NauXoYTAka8qXNPYlW5g7r6NNX1x8cnvDRbEGkRsMoY=";
|
||||
version = "0.0.24";
|
||||
sha256 = "sha256-/MLeBsnUdzcDB4nUrugEF05HKqC30G9muYKvmlnLM7U=";
|
||||
};
|
||||
meta = {
|
||||
description = "VSCode language extension for Uiua";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode";
|
||||
homepage = "https://github.com/uiua-lang/uiua-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomasajt wackbyte ];
|
||||
maintainers = with lib.maintainers; [ tomasajt wackbyte defelo ];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
mainProgram = "nnn";
|
||||
};
|
||||
})
|
||||
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://git.2f30.org/noice/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ iogamaster ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch
|
||||
, xorg, imlib2, libjpeg, libpng
|
||||
, curl, libexif, jpegexiforient, perl
|
||||
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
|
||||
@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upstream PR: https://github.com/derf/feh/pull/723
|
||||
(fetchpatch {
|
||||
name = "fix-right-click-buffer-overflow.patch";
|
||||
url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch";
|
||||
sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://www.geeqie.org/";
|
||||
|
||||
maintainers = with maintainers; [ jfrankenau pSub markus1189 ];
|
||||
maintainers = with maintainers; [ pSub markus1189 ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -100,6 +100,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://www.damonlynch.net/rapid/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ mkDerivation rec {
|
||||
homepage = "https://github.com/vigri/scantailor-advanced";
|
||||
description = "Interactive post-processing tool for scanned pages (vigri's fork)";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; gnu ++ linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/muennich/sxiv";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ h7x4 ];
|
||||
};
|
||||
}
|
||||
|
@ -1,17 +1,15 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{ lib, fetchCrate, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "keepass-diff";
|
||||
version = "1.1.3";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Narigo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jd/cUkTHylLwzxolQUzMlXHauCfXUhcUr/1zKpdngbo=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2e2lGG72HmX7AFk0+J3U62Kch5ylrqvaIpitRF546JA=";
|
||||
cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI-tool to diff Keepass (.kdbx) files";
|
||||
|
@ -104,6 +104,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs \
|
||||
--replace "libGL.so.1" "${libGL}/lib/libGL.so.1"
|
||||
|
||||
SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer
|
||||
SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop
|
||||
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "parsec-bin";
|
||||
version = "150_86e";
|
||||
version = "150_90c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb";
|
||||
sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU=";
|
||||
url = "https://web.archive.org/web/20231028212419/https://builds.parsec.app/package/parsec-linux.deb";
|
||||
sha256 = "sha256-rFSdl7BgnuJAj6w5in0/yszO8b5qcr9b+wjF1WkAU70=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -104,7 +104,7 @@ stdenvNoCC.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://parsecgaming.com/";
|
||||
homepage = "https://parsec.app/";
|
||||
changelog = "https://parsec.app/changelog";
|
||||
description = "Remote streaming service client";
|
||||
license = licenses.unfree;
|
||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "tvbrowser";
|
||||
maintainers = with maintainers; [ jfrankenau yarny ];
|
||||
maintainers = with maintainers; [ yarny ];
|
||||
longDescription = ''
|
||||
TV-Browser shows TV program data arranged like in printed
|
||||
TV programs after downloading it from the internet.
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "typioca";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloznelis";
|
||||
repo = "typioca";
|
||||
rev = version;
|
||||
hash = "sha256-PVyEvPktb2ortmPf1afk6vXmcp91Zei8BLwGkRazFGA=";
|
||||
hash = "sha256-cm6z7MVAbFxfkSTaCfh8wZhtgXdfVQopqEk+w+hPZpI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4=";
|
||||
|
@ -38,6 +38,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://github.com/firecat53/urlscan";
|
||||
changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dpaetzel jfrankenau ];
|
||||
maintainers = with maintainers; [ dpaetzel ];
|
||||
};
|
||||
}
|
||||
|
@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -47,6 +47,7 @@
|
||||
, glibc # gconv + locale
|
||||
# postFixup:
|
||||
, vulkan-loader
|
||||
, libglvnd
|
||||
|
||||
# Package customization:
|
||||
, cupsSupport ? true, cups ? null
|
||||
@ -479,7 +480,7 @@ let
|
||||
# libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp
|
||||
chromiumBinary="$libExecPath/$packageName"
|
||||
origRpath="$(patchelf --print-rpath "$chromiumBinary")"
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary"
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ libGL libglvnd vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.17.3";
|
||||
version = "1.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YPC+mwXKZOOhLtUU+WHdkQtHFYfIYOiadbuAHLvAXxM=";
|
||||
hash = "sha256-vzdlcyA+RCr8RH0KbTiUah8lS++Xq6gLCHbgHHBFEig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w=";
|
||||
sha256 = "sha256-Lm7TrdUAYPYBKC+9lPmWTDp0BQqiAc/A107wtiGDwZ4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeseal";
|
||||
version = "0.24.2";
|
||||
version = "0.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitnami-labs";
|
||||
repo = "sealed-secrets";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vKAKDQrQ7FmCnJwo8ItwpiayrHa9bhMognYZMlpZAlM=";
|
||||
sha256 = "sha256-0KXAN8unaReYFyuGI6XCHhxKiKow0suP9yDl5pI+bGQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LPxU6qvpUb0ZjzjqGeTywOluwWbsi1YmiYYWJfaMWvg=";
|
||||
vendorHash = "sha256-gbizFiZ+LFdY0SISK3K0D0vwj4Dq/UMcoCuvUYMB/F4=";
|
||||
|
||||
subPackages = [ "cmd/kubeseal" ];
|
||||
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc=";
|
||||
hash = "sha256-E/M0GliZwe8aDZDtuCea5II452Zy9pD+9MmYFSkmjE8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw=";
|
||||
vendorHash = "sha256-VmukCrEl2hldN0kBgDycp/junmXCZsH+utNJGNjodW0=";
|
||||
proxyVendor = true;
|
||||
|
||||
preBuild = ''
|
||||
|
@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "unstable-2023-10-22";
|
||||
version = "unstable-2023-11-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5";
|
||||
hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0=";
|
||||
rev = "002e382c0de1d87e2ce7fd579346da4f339880ca";
|
||||
hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA=";
|
||||
vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
@ -60,6 +60,9 @@
|
||||
, mm-common
|
||||
, rlottie
|
||||
, stdenv
|
||||
, darwin
|
||||
, lld
|
||||
, libicns
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
@ -72,6 +75,7 @@
|
||||
|
||||
let
|
||||
tg_owt = callPackage ./tg_owt.nix {
|
||||
inherit stdenv;
|
||||
abseil-cpp = abseil-cpp.override {
|
||||
cxxStandard = "20";
|
||||
};
|
||||
@ -100,6 +104,7 @@ let
|
||||
perlPackages.XMLParser
|
||||
];
|
||||
});
|
||||
mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
@ -114,6 +119,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
./macos.patch
|
||||
# the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling
|
||||
# and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary
|
||||
# see https://github.com/NixOS/nixpkgs/issues/218370
|
||||
@ -123,7 +129,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
|
||||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
|
||||
@ -143,39 +149,45 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
ninja
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
extra-cmake-modules
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
lld
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwayland
|
||||
qtsvg
|
||||
qtimageformats
|
||||
gtk3
|
||||
boost
|
||||
fmt
|
||||
libdbusmenu
|
||||
lz4
|
||||
xxHash
|
||||
ffmpeg
|
||||
openalSoft
|
||||
minizip
|
||||
libopus
|
||||
range-v3
|
||||
tl-expected
|
||||
rnnoise
|
||||
protobuf
|
||||
tg_owt
|
||||
microsoft-gsl
|
||||
rlottie
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qtwayland
|
||||
gtk3
|
||||
fmt
|
||||
libdbusmenu
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
pipewire
|
||||
range-v3
|
||||
tl-expected
|
||||
hunspell
|
||||
glibmm
|
||||
webkitgtk_6_0
|
||||
jemalloc
|
||||
rnnoise
|
||||
protobuf
|
||||
tg_owt
|
||||
# Transitive dependencies:
|
||||
util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
|
||||
pcre
|
||||
@ -192,9 +204,44 @@ stdenv.mkDerivation rec {
|
||||
libsysprof-capture
|
||||
libpsl
|
||||
brotli
|
||||
microsoft-gsl
|
||||
rlottie
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
CoreServices
|
||||
CoreText
|
||||
CoreGraphics
|
||||
CoreMedia
|
||||
OpenGL
|
||||
AudioUnit
|
||||
ApplicationServices
|
||||
Foundation
|
||||
AGL
|
||||
Security
|
||||
SystemConfiguration
|
||||
Carbon
|
||||
AudioToolbox
|
||||
VideoToolbox
|
||||
VideoDecodeAcceleration
|
||||
AVFoundation
|
||||
CoreAudio
|
||||
CoreVideo
|
||||
CoreMediaIO
|
||||
QuartzCore
|
||||
AppKit
|
||||
CoreWLAN
|
||||
WebKit
|
||||
IOKit
|
||||
GSS
|
||||
MediaPlayer
|
||||
IOSurface
|
||||
Metal
|
||||
NaturalLanguage
|
||||
libicns
|
||||
]);
|
||||
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-Ddisable_autoupdate=ON"
|
||||
@ -210,13 +257,21 @@ stdenv.mkDerivation rec {
|
||||
export GI_GIR_PATH="$XDG_DATA_DIRS"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
installPhase = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r ${mainProgram}.app $out/Applications
|
||||
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
# This is necessary to run Telegram in a pure environment.
|
||||
# We also use gappsWrapperArgs from wrapGAppsHook.
|
||||
wrapProgram $out/bin/telegram-desktop \
|
||||
wrapProgram $out/bin/${mainProgram} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@ -231,10 +286,9 @@ stdenv.mkDerivation rec {
|
||||
the MTProto secure protocol.
|
||||
'';
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://desktop.telegram.org/";
|
||||
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
mainProgram = "telegram-desktop";
|
||||
inherit mainProgram;
|
||||
};
|
||||
}
|
||||
|
@ -0,0 +1,69 @@
|
||||
diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
|
||||
index ef544803e9..69c61b3139 100644
|
||||
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
|
||||
+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
|
||||
@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) {
|
||||
[window setTitleVisibility:NSWindowTitleHidden];
|
||||
[window setTitlebarAppearsTransparent:YES];
|
||||
[window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
_data->topNotchSkip = [[window screen] safeAreaInsets].top;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) {
|
||||
Submodule Telegram/lib_base contains modified content
|
||||
diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
index 7ce90d3..dac3c2c 100644
|
||||
--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
|
||||
_observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)];
|
||||
|
||||
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
[center
|
||||
addObserver: _observer
|
||||
@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
|
||||
name: NSProcessInfoPowerStateDidChangeNotification
|
||||
object: nil];
|
||||
}
|
||||
+#endif
|
||||
[center
|
||||
addObserver: _observer
|
||||
selector: @selector(powerStateChanged:)
|
||||
@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const {
|
||||
return std::nullopt;
|
||||
}
|
||||
NSProcessInfo *info = [NSProcessInfo processInfo];
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
if ([info isLowPowerModeEnabled]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
const auto state = DetectBatteryState();
|
||||
if (!state.has || !state.draining) {
|
||||
return false;
|
||||
Submodule Telegram/lib_webview contains modified content
|
||||
diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
index 738e574..80ff5f0 100644
|
||||
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
@@ -254,10 +254,12 @@ void *Instance::winId() {
|
||||
}
|
||||
|
||||
void Instance::setOpaqueBg(QColor opaqueBg) {
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
[_webview setValue: @NO forKey: @"drawsBackground"];
|
||||
[_webview setUnderPageBackgroundColor:[NSColor clearColor]];
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void Instance::resizeToWindow() {
|
@ -4,7 +4,7 @@
|
||||
, openh264, usrsctp, libevent, libvpx
|
||||
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
|
||||
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
|
||||
, mesa, libepoxy, libglvnd, unstableGitUpdater
|
||||
, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -24,12 +24,28 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg libopus ffmpeg alsa-lib libpulseaudio protobuf
|
||||
openh264 usrsctp libevent libvpx
|
||||
libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
|
||||
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
|
||||
glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio
|
||||
mesa libepoxy libglvnd
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Cocoa
|
||||
AppKit
|
||||
IOKit
|
||||
IOSurface
|
||||
Foundation
|
||||
AVFoundation
|
||||
CoreMedia
|
||||
VideoToolbox
|
||||
CoreGraphics
|
||||
CoreVideo
|
||||
OpenGL
|
||||
Metal
|
||||
MetalKit
|
||||
CoreFoundation
|
||||
ApplicationServices
|
||||
]);
|
||||
|
||||
patches = [
|
||||
# GCC 12 Fix
|
||||
|
569
pkgs/applications/networking/irc/halloy/Cargo.lock
generated
569
pkgs/applications/networking/irc/halloy/Cargo.lock
generated
@ -145,6 +145,134 @@ dependencies = [
|
||||
"libloading 0.7.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-broadcast"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
"futures-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-channel"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"event-listener",
|
||||
"futures-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-executor"
|
||||
version = "1.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
"async-task",
|
||||
"concurrent-queue",
|
||||
"fastrand",
|
||||
"futures-lite",
|
||||
"slab",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-fs"
|
||||
version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
"autocfg",
|
||||
"blocking",
|
||||
"futures-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-io"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
"concurrent-queue",
|
||||
"futures-lite",
|
||||
"log",
|
||||
"parking",
|
||||
"polling",
|
||||
"rustix",
|
||||
"slab",
|
||||
"socket2",
|
||||
"waker-fn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-lock"
|
||||
version = "2.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-process"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
|
||||
dependencies = [
|
||||
"async-io",
|
||||
"async-lock",
|
||||
"autocfg",
|
||||
"blocking",
|
||||
"cfg-if",
|
||||
"event-listener",
|
||||
"futures-lite",
|
||||
"rustix",
|
||||
"signal-hook",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-recursion"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-task"
|
||||
version = "4.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atomic-waker"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
@ -211,6 +339,15 @@ version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.10.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-sys"
|
||||
version = "0.1.0-beta.1"
|
||||
@ -230,6 +367,21 @@ dependencies = [
|
||||
"objc2-encode",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "blocking"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-lock",
|
||||
"async-task",
|
||||
"atomic-waker",
|
||||
"fastrand",
|
||||
"futures-lite",
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.13.0"
|
||||
@ -313,7 +465,7 @@ dependencies = [
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"serde",
|
||||
"time",
|
||||
"time 0.1.45",
|
||||
"wasm-bindgen",
|
||||
"winapi",
|
||||
]
|
||||
@ -412,6 +564,15 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
|
||||
|
||||
[[package]]
|
||||
name = "concurrent-queue"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
version = "0.9.3"
|
||||
@ -473,6 +634,15 @@ dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.3.2"
|
||||
@ -531,6 +701,16 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
|
||||
|
||||
[[package]]
|
||||
name = "crypto-common"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "d3d12"
|
||||
version = "0.6.0"
|
||||
@ -567,6 +747,27 @@ dependencies = [
|
||||
"tokio-stream",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derivative"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "digest"
|
||||
version = "0.10.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
|
||||
dependencies = [
|
||||
"block-buffer",
|
||||
"crypto-common",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "2.0.0"
|
||||
@ -628,6 +829,27 @@ dependencies = [
|
||||
"winreg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
|
||||
dependencies = [
|
||||
"enumflags2_derive",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2_derive"
|
||||
version = "0.7.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.1"
|
||||
@ -678,6 +900,12 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "2.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
|
||||
|
||||
[[package]]
|
||||
name = "exr"
|
||||
version = "1.6.4"
|
||||
@ -827,6 +1055,21 @@ version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
|
||||
|
||||
[[package]]
|
||||
name = "futures-lite"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
"memchr",
|
||||
"parking",
|
||||
"pin-project-lite",
|
||||
"waker-fn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.28"
|
||||
@ -868,6 +1111,16 @@ dependencies = [
|
||||
"slab",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
|
||||
dependencies = [
|
||||
"typenum",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gethostname"
|
||||
version = "0.2.3"
|
||||
@ -1020,6 +1273,7 @@ dependencies = [
|
||||
"iced",
|
||||
"image",
|
||||
"log",
|
||||
"notify-rust",
|
||||
"once_cell",
|
||||
"open",
|
||||
"palette",
|
||||
@ -1084,6 +1338,12 @@ version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||
|
||||
[[package]]
|
||||
name = "hexf-parse"
|
||||
version = "0.2.1"
|
||||
@ -1522,6 +1782,19 @@ dependencies = [
|
||||
"hashbrown 0.14.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mac-notification-sys"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"dirs-next",
|
||||
"objc-foundation",
|
||||
"objc_id",
|
||||
"time 0.3.23",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "malloc_buf"
|
||||
version = "0.0.6"
|
||||
@ -1777,6 +2050,19 @@ dependencies = [
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-rust"
|
||||
version = "4.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e"
|
||||
dependencies = [
|
||||
"log",
|
||||
"mac-notification-sys",
|
||||
"serde",
|
||||
"tauri-winrt-notification",
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
@ -1981,6 +2267,16 @@ dependencies = [
|
||||
"redox_syscall 0.3.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordered-stream"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ouroboros"
|
||||
version = "0.17.0"
|
||||
@ -2037,6 +2333,12 @@ dependencies = [
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.2"
|
||||
@ -2190,6 +2492,22 @@ dependencies = [
|
||||
"miniz_oxide 0.7.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polling"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bitflags 1.3.2",
|
||||
"cfg-if",
|
||||
"concurrent-queue",
|
||||
"libc",
|
||||
"log",
|
||||
"pin-project-lite",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
@ -2552,6 +2870,17 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_repr"
|
||||
version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "0.6.2"
|
||||
@ -2573,6 +2902,27 @@ dependencies = [
|
||||
"yaml-rust",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha1"
|
||||
version = "0.10.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"signal-hook-registry",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.1"
|
||||
@ -2770,6 +3120,16 @@ dependencies = [
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tauri-winrt-notification"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f"
|
||||
dependencies = [
|
||||
"quick-xml",
|
||||
"windows 0.39.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.5.0"
|
||||
@ -2834,6 +3194,22 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia"
|
||||
version = "0.8.4"
|
||||
@ -3008,9 +3384,21 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"pin-project-lite",
|
||||
"tracing-attributes",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-attributes"
|
||||
version = "0.1.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.31"
|
||||
@ -3037,6 +3425,22 @@ dependencies = [
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
|
||||
|
||||
[[package]]
|
||||
name = "uds_windows"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d"
|
||||
dependencies = [
|
||||
"tempfile",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi"
|
||||
version = "0.3.13"
|
||||
@ -3148,6 +3552,12 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "waker-fn"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
@ -3540,6 +3950,19 @@ dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
|
||||
dependencies = [
|
||||
"windows_aarch64_msvc 0.39.0",
|
||||
"windows_i686_gnu 0.39.0",
|
||||
"windows_i686_msvc 0.39.0",
|
||||
"windows_x86_64_gnu 0.39.0",
|
||||
"windows_x86_64_msvc 0.39.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.44.0"
|
||||
@ -3633,6 +4056,12 @@ version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.42.2"
|
||||
@ -3645,6 +4074,12 @@ version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.42.2"
|
||||
@ -3657,6 +4092,12 @@ version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.42.2"
|
||||
@ -3669,6 +4110,12 @@ version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.42.2"
|
||||
@ -3693,6 +4140,12 @@ version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.39.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.42.2"
|
||||
@ -3815,6 +4268,16 @@ dependencies = [
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xdg-home"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
|
||||
dependencies = [
|
||||
"nix 0.26.2",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xml-rs"
|
||||
version = "0.8.13"
|
||||
@ -3836,6 +4299,72 @@ version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
|
||||
|
||||
[[package]]
|
||||
name = "zbus"
|
||||
version = "3.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
|
||||
dependencies = [
|
||||
"async-broadcast",
|
||||
"async-executor",
|
||||
"async-fs",
|
||||
"async-io",
|
||||
"async-lock",
|
||||
"async-process",
|
||||
"async-recursion",
|
||||
"async-task",
|
||||
"async-trait",
|
||||
"blocking",
|
||||
"byteorder",
|
||||
"derivative",
|
||||
"enumflags2",
|
||||
"event-listener",
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
"futures-util",
|
||||
"hex",
|
||||
"nix 0.26.2",
|
||||
"once_cell",
|
||||
"ordered-stream",
|
||||
"rand",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"sha1",
|
||||
"static_assertions",
|
||||
"tracing",
|
||||
"uds_windows",
|
||||
"winapi",
|
||||
"xdg-home",
|
||||
"zbus_macros",
|
||||
"zbus_names",
|
||||
"zvariant",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zbus_macros"
|
||||
version = "3.14.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"syn 1.0.109",
|
||||
"zvariant_utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zbus_names"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"static_assertions",
|
||||
"zvariant",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zeno"
|
||||
version = "0.2.2"
|
||||
@ -3850,3 +4379,41 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
|
||||
dependencies = [
|
||||
"simd-adler32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zvariant"
|
||||
version = "3.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"enumflags2",
|
||||
"libc",
|
||||
"serde",
|
||||
"static_assertions",
|
||||
"zvariant_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zvariant_derive"
|
||||
version = "3.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"zvariant_utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zvariant_utils"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halloy";
|
||||
version = "2023.4";
|
||||
version = "2023.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j5Yw7rXdNd32RnbV2jQ+ZUjbm14AKZ7khQNX6A+qPAM=";
|
||||
hash = "sha256-XGNFLfZDDGTT55UAsapUf1B0uSzrNjwSRK+yQSU3wG0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
@ -60,6 +60,7 @@ let
|
||||
homepage = "https://localsend.org/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "localsend";
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = builtins.attrNames srcs;
|
||||
};
|
||||
|
@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A small but very powerful text-based mail client";
|
||||
homepage = "http://www.neomutt.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ];
|
||||
maintainers = with maintainers; [ erikryb vrthra ma27 raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -19,6 +19,7 @@
|
||||
, libsecret
|
||||
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
|
||||
, systemd
|
||||
, withScripts ? true
|
||||
}:
|
||||
|
||||
let
|
||||
@ -124,9 +125,11 @@ let
|
||||
};
|
||||
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "msmtp-${version}";
|
||||
inherit version meta;
|
||||
paths = [ binaries scripts ];
|
||||
passthru = { inherit binaries scripts; };
|
||||
}
|
||||
if withScripts then
|
||||
symlinkJoin
|
||||
{
|
||||
name = "msmtp-${version}";
|
||||
inherit version meta;
|
||||
paths = [ binaries scripts ];
|
||||
passthru = { inherit binaries scripts; };
|
||||
} else binaries
|
||||
|
@ -38,7 +38,7 @@ buildGoModule rec {
|
||||
description = "WireGuard automation from homelab to enterprise";
|
||||
homepage = "https://netmaker.io";
|
||||
changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}";
|
||||
license = licenses.sspl;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ urandom qjoly ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easycrypt";
|
||||
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
findlib
|
||||
menhir
|
||||
ocaml
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
buildInputs = with ocamlPackages; [
|
||||
batteries
|
||||
@ -33,10 +34,13 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})'
|
||||
'';
|
||||
|
||||
pythonPath = with python3.pkgs; [ pyyaml ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dune install --prefix $out ${pname}
|
||||
rm $out/bin/ec-runtest
|
||||
wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
@ -12,10 +12,12 @@ let
|
||||
''
|
||||
#!${runtimeShell}
|
||||
cd $out/lib/hol_light
|
||||
export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}${camlp5}/lib/ocaml/${ocaml.version}/site-lib/"
|
||||
exec ${ocaml}/bin/ocaml \
|
||||
-I \`${camlp5}/bin/camlp5 -where\` \
|
||||
${load_num} \
|
||||
-I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma
|
||||
-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ \
|
||||
-I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma \
|
||||
-init make.ml
|
||||
'';
|
||||
in
|
||||
@ -25,13 +27,13 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hol_light";
|
||||
version = "unstable-2023-07-21";
|
||||
version = "unstable-2023-11-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrh13";
|
||||
repo = "hol-light";
|
||||
rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349";
|
||||
hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E=";
|
||||
rev = "dcd765c6032f52a0c0bf21fce5da4794a823e880";
|
||||
hash = "sha256-k2RBNDo4tc3eobKB84Y2xr0UQJvef0hv6jyFCaDCQFM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/jarun/bcal";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -50,6 +50,6 @@ in stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -1,15 +1,28 @@
|
||||
{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11
|
||||
, libXcomposite, glfw, libpulseaudio, ffmpeg }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, libXcomposite
|
||||
, libpulseaudio
|
||||
, ffmpeg
|
||||
, wayland
|
||||
, libdrm
|
||||
, libva
|
||||
, libglvnd
|
||||
, libXrandr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "gpu-screen-recorder";
|
||||
version = "1.0.0";
|
||||
version = "unstable-2023-11-18";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder";
|
||||
rev = "36fd4516db06bcb192e49055319d1778bbed0322";
|
||||
sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w=";
|
||||
# printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
src = fetchurl {
|
||||
url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r418.5a8900e.tar.gz";
|
||||
hash = "sha256-Dal6KxQOTqoNH6e8lYk5XEXGFG/vzbguNFZ9yk9nKe0=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -17,27 +30,26 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glew
|
||||
libX11
|
||||
libXcomposite
|
||||
glfw
|
||||
libpulseaudio
|
||||
ffmpeg
|
||||
wayland
|
||||
libdrm
|
||||
libva
|
||||
libXrandr
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./build.sh \
|
||||
--replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \
|
||||
--replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
./build.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin/ gpu-screen-recorder
|
||||
wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
|
||||
postInstall = ''
|
||||
install -Dt $out/bin gpu-screen-recorder gsr-kms-server
|
||||
mkdir $out/bin/.wrapped
|
||||
mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/
|
||||
makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \
|
||||
--prefix LD_LIBRARY_PATH : ${libglvnd}/lib \
|
||||
--prefix PATH : $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,38 +0,0 @@
|
||||
diff --git a/build.sh b/build.sh
|
||||
index 05603db..8c38b31 100755
|
||||
--- a/build.sh
|
||||
+++ b/build.sh
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
dependencies="gtk+-3.0 x11 xrandr libpulse"
|
||||
includes="$(pkg-config --cflags $dependencies)"
|
||||
-libs="$(pkg-config --libs $dependencies)"
|
||||
+libs="$(pkg-config --libs $dependencies) -ldl"
|
||||
g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index ae2078f..9dcdce1 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <pwd.h>
|
||||
#include <libgen.h>
|
||||
#include <functional>
|
||||
+#include <dlfcn.h>
|
||||
|
||||
typedef struct {
|
||||
Display *display;
|
||||
@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata)
|
||||
}
|
||||
|
||||
static bool is_nv_fbc_installed() {
|
||||
- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0;
|
||||
+ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY);
|
||||
+ if (handle) {
|
||||
+ dlclose(handle);
|
||||
+ return true;
|
||||
+ } else {
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
|
||||
static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) {
|
@ -1,28 +1,36 @@
|
||||
{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr
|
||||
, libpulseaudio, gpu-screen-recorder }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, gtk3
|
||||
, libpulseaudio
|
||||
, libdrm
|
||||
, gpu-screen-recorder
|
||||
, libglvnd
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "gpu-screen-recorder-gtk";
|
||||
version = "0.1.0";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk";
|
||||
rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead";
|
||||
sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4=";
|
||||
src = fetchurl {
|
||||
url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r175.cfd18af.tar.gz";
|
||||
hash = "sha256-HhZe22Hm9yGoy5WoyuP2+Wj8E3nMs4uf96mzmP6CMqU=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-nvfbc-check.patch ];
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libX11
|
||||
libXrandr
|
||||
libpulseaudio
|
||||
libdrm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
@ -33,7 +41,9 @@ stdenv.mkDerivation rec {
|
||||
install -Dt $out/bin/ gpu-screen-recorder-gtk
|
||||
install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop
|
||||
|
||||
wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}
|
||||
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]})
|
||||
# we also append /run/opengl-driver/lib as it otherwise fails to find libcuda.
|
||||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/hoyon/mpv-mpris";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${version}";
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@ -15,6 +16,16 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull a patch which fixes the tests, but is not yet released in a new version:
|
||||
# https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38
|
||||
(fetchpatch {
|
||||
name = "fix-tests.patch";
|
||||
url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch";
|
||||
sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
@ -28,6 +39,7 @@ python3Packages.buildPythonApplication rec {
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
behave
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bruno";
|
||||
version = "0.27.2";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb";
|
||||
hash = "sha256-FhlwwdX845Say6I/g9HYRTexh94DXhc/K9jmqFiHwVY=";
|
||||
hash = "sha256-lG5OMxDS7I2jmI6syWzTsHm/NEoGanilW8IPebs+/10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];
|
||||
|
60
pkgs/by-name/ce/centrifugo/package.nix
Normal file
60
pkgs/by-name/ce/centrifugo/package.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, nixosTests
|
||||
, testers
|
||||
, centrifugo
|
||||
}:
|
||||
let
|
||||
# Inspect build flags with `go version -m centrifugo`.
|
||||
statsEndpoint = "https://graphite-prod-01-eu-west-0.grafana.net/graphite/metrics,https://stats.centrifugal.dev/usage";
|
||||
statsToken = "425599:eyJrIjoi" +
|
||||
"OWJhMTcyZGNjN2FkYjEzM2E1OTQwZjIyMTU3MTBjMjUyYzAyZWE2MSIsIm4iOiJVc2FnZSBTdGF0cyIsImlkIjo2NDUzOTN9";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "centrifugo";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g496cXjgliDi2XLkdE+dERrUl5hBGLICJx5JundeOfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VuxnP9Dryo0L7sGvtvAIicYGkHoQ2iGVBtAdkmiqL7E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/centrifugal/centrifugo/v5/internal/build.Version=${version}"
|
||||
"-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsEndpoint=${statsEndpoint}"
|
||||
"-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsToken=${statsToken}"
|
||||
];
|
||||
|
||||
excludedPackages = [
|
||||
"./internal/gen/api"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
inherit (nixosTests) centrifugo;
|
||||
version = testers.testVersion {
|
||||
package = centrifugo;
|
||||
command = "${pname} version";
|
||||
version = "v${version}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Scalable real-time messaging server";
|
||||
homepage = "https://centrifugal.dev";
|
||||
changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.tie ];
|
||||
mainProgram = "centrifugo";
|
||||
};
|
||||
}
|
54
pkgs/by-name/gc/gcp-scanner/package.nix
Normal file
54
pkgs/by-name/gc/gcp-scanner/package.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gcp-scanner";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "gcp_scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mMvAoqwptCA73JiUl8HIhFBO198NnUmvCbf8Rk9dWxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-git-versioning
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
google-api-python-client
|
||||
google-cloud-container
|
||||
google-cloud-iam
|
||||
httplib2
|
||||
pyu2f
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gcp_scanner"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require credentials
|
||||
"TestCrawler"
|
||||
"test_acceptance"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A comprehensive scanner for Google Cloud";
|
||||
homepage = "https://github.com/google/gcp_scanner";
|
||||
changelog = "https://github.com/google/gcp_scanner/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "gcp-scanner";
|
||||
};
|
||||
}
|
27
pkgs/by-name/ke/keedump/package.nix
Normal file
27
pkgs/by-name/ke/keedump/package.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "keedump";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ynuwenhof";
|
||||
repo = "keedump";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-b5jRWmyCvKCDn1fIXTtLCI1Ckr+Ttt7erDbZs4U2TcE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "PoC KeePass master password dumper";
|
||||
homepage = "https://github.com/ynuwenhof/keedump";
|
||||
changelog = "https://github.com/ynuwenhof/keedump/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "keedump";
|
||||
};
|
||||
}
|
36
pkgs/by-name/le/legba/package.nix
Normal file
36
pkgs/by-name/le/legba/package.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "legba";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evilsocket";
|
||||
repo = "legba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zZQZuMjyQEuXNor3g4P0YLvvj2DaU3A3/FUzCRJxnZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qFdV4s//CsLi8tjQ36z3+ECMQR8evtCUKbauf6XpJ04=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl.dev ];
|
||||
|
||||
# Paho C test fails due to permission issue
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A multiprotocol credentials bruteforcer / password sprayer and enumerator";
|
||||
homepage = "https://github.com/evilsocket/legba";
|
||||
changelog = "https://github.com/evilsocket/legba/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "legba";
|
||||
};
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Lode <johannes.lode@dynainstruments.com>
|
||||
Date: Thu, 14 Nov 2019 10:44:00 +0100
|
||||
Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as
|
||||
regular functions.
|
||||
|
||||
While cross-compiling there occurred "undefined reference to
|
||||
`rpl_malloc'", the suggested change fixes the problem.
|
||||
|
||||
Tested for native X86_64 and armv7a-unknown-linux-gnueabihf.
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 008499d..b492dc4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX],
|
||||
|
||||
# This is always checked (library needs this)
|
||||
AC_HEADER_STDC
|
||||
-AC_FUNC_MALLOC
|
||||
+# AC_FUNC_MALLOC -- does not work while cross-compiling
|
||||
+AC_CHECK_FUNC([malloc realloc])
|
||||
AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])])
|
||||
AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])])
|
||||
AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])])
|
||||
--
|
||||
2.25.1
|
||||
|
45
pkgs/by-name/li/libgpiod_1/package.nix
Normal file
45
pkgs/by-name/li/libgpiod_1/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod
|
||||
, enable-tools ? true
|
||||
, enablePython ? false, python3, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgpiod";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cross compiling fix
|
||||
# https://github.com/brgl/libgpiod/pull/45
|
||||
./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch
|
||||
];
|
||||
|
||||
buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-tools=${if enable-tools then "yes" else "no"}"
|
||||
"--enable-bindings-cxx"
|
||||
"--prefix=${placeholder "out"}"
|
||||
] ++ lib.optional enablePython "--enable-bindings-python";
|
||||
|
||||
meta = with lib; {
|
||||
description = "C library and tools for interacting with the linux GPIO character device";
|
||||
longDescription = ''
|
||||
Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
|
||||
the character device instead. This library encapsulates the ioctl calls and
|
||||
data structures behind a straightforward API.
|
||||
'';
|
||||
homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.expipiplus1 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
33
pkgs/by-name/pa/padre/package.nix
Normal file
33
pkgs/by-name/pa/padre/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "padre";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glebarez";
|
||||
repo = "padre";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UkL0EydwQfZl4HVtXiU8AyLJnzqBwECIgwm3bpQvyes=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BBDGnz8u2FEKwuTP9DKz6FoODaW4+VFcL36lumoYTb8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Advanced exploiting tool for Padding Oracle attacks against CBC mode encryption";
|
||||
homepage = "https://github.com/glebarez/padre";
|
||||
changelog = "https://github.com/glebarez/padre/releases/tag/v${version}";
|
||||
# https://github.com/glebarez/padre/issues/28
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "padre";
|
||||
};
|
||||
}
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "unstable-2023-10-01";
|
||||
version = "unstable-2023-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "d56b31d67473e0970bc457469b0cbec2e35f8b10";
|
||||
hash = "sha256-/lMjL2dl7UVYRjafFKmV3XsIH6QehUWCozCuBuxFgpQ=";
|
||||
rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844";
|
||||
hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -46,6 +46,9 @@ rustPlatform.buildRustPackage rec {
|
||||
SYMBOLICATOR_GIT_VERSION = src.rev;
|
||||
SYMBOLICATOR_RELEASE = version;
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
} // lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
};
|
||||
|
||||
# tests require network access
|
||||
|
@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = version;
|
||||
hash = "sha256-RAMQC9weEvTV44nAXjwMYv+4O5aSNNM5UOf/xBb4SBE=";
|
||||
hash = "sha256-+Hh9vNVWen5ri8+Qy4pzaMrC0Laa1xMlURxEYwo4hSk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZBedAIHwbRiR9i6w0CWIiE+OJvTkmxiEihn7zLAV/Dg=";
|
||||
cargoHash = "sha256-tLBWbnER5ufK3NQ6mxzqY/dmiwaPKTcPOXS68S6yXf4=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
@ -58,6 +58,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://www.uiua.org/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "uiua";
|
||||
maintainers = with lib.maintainers; [ cafkafk tomasajt ];
|
||||
maintainers = with lib.maintainers; [ cafkafk tomasajt defelo ];
|
||||
};
|
||||
}
|
||||
|
@ -136,7 +136,6 @@ buildNpmPackage rec {
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
jfrankenau
|
||||
ttuegel
|
||||
babariviere
|
||||
rileyinman
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "junicode";
|
||||
version = "2.200";
|
||||
version = "2.203";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";
|
||||
hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw=";
|
||||
hash = "sha256-RG12veiZXqjfK2gONmauhGReuLEkqxbQ4h4PEwaih/U=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
name = "alacritty-theme";
|
||||
version = "unstable-2023-10-26";
|
||||
version = "unstable-2023-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928";
|
||||
hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0=";
|
||||
rev = "808b81b2e88884e8eca5d951b89f54983fa6c237";
|
||||
hash = "sha256-g5tM6VBPLXin5s7X0PpzWOOGTEwHpVUurWOPqM/O13A=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "granite";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-siFS8BiHVlDtM5odL0Lf1aRMoG6qqQOnbsXGKVyc218=";
|
||||
sha256 = "sha256-z/6GxWfbsngySv2ziNwzhcEfTamxP1DnJ2ld9fft/1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,12 +4,12 @@
|
||||
|
||||
let
|
||||
pname = "elixir-ls";
|
||||
version = "0.17.3";
|
||||
version = "0.17.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lsp";
|
||||
repo = "elixir-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E+tlnkwJiyG8x29um/G7OqIDCJ/laDMTm3z7VvdWy6s=";
|
||||
hash = "sha256-LUAYfR6MNNGLaqv8EBx0JQ8KYYD7jRvez3HJFnczV+Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
@ -21,7 +21,7 @@ mixRelease {
|
||||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
hash = "sha256-ltSYZYsXWiq5ASvRmR7ETgK9e8bj4f9bhZAZEIceLkw=";
|
||||
hash = "sha256-MVGYENy6/xI/ph/X0DxquigCuLK1FAEIONzoQU7TXoM=";
|
||||
};
|
||||
|
||||
# elixir-ls is an umbrella app
|
||||
|
@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
env = {
|
||||
LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev;
|
||||
} // lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
};
|
||||
|
||||
# process didn't exit successfully: <...> SIGSEGV
|
||||
|
@ -14,12 +14,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.58.0";
|
||||
version = "1.59.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE=";
|
||||
sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, libftdi1
|
||||
@ -12,7 +11,7 @@
|
||||
, automake
|
||||
, texinfo
|
||||
, git
|
||||
, libgpiod
|
||||
, libgpiod_1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -42,13 +41,7 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++
|
||||
# tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
|
||||
lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
|
||||
version = "1.6.4";
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
|
||||
};
|
||||
}));
|
||||
lib.optional stdenv.isLinux libgpiod_1;
|
||||
|
||||
configurePhase = ''
|
||||
SKIP_SUBMODULE=1 ./bootstrap
|
||||
|
@ -6,7 +6,7 @@
|
||||
, jimtcl
|
||||
, libjaylink
|
||||
, libusb1
|
||||
, libgpiod
|
||||
, libgpiod_1
|
||||
|
||||
, enableFtdi ? true, libftdi1
|
||||
|
||||
@ -27,13 +27,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]
|
||||
++
|
||||
# tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
|
||||
lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
|
||||
version = "1.6.4";
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
|
||||
};
|
||||
}));
|
||||
lib.optional stdenv.isLinux libgpiod_1;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-werror"
|
||||
|
@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
|
||||
shared = if stdenv.isDarwin then "dylib" else "shared";
|
||||
configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
|
||||
++ lib.optionals disableDocs [ "--disable-docs" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ];
|
||||
++ lib.optionals stdenv.isDarwin [ "--disable-strip" "--enable-xonx" ];
|
||||
|
||||
configureScript = "../configure";
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, lib, mkDerivation, standard-library }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.4";
|
||||
version = "0.4.1";
|
||||
pname = "functional-linear-algebra";
|
||||
|
||||
buildInputs = [ standard-library ];
|
||||
@ -10,7 +10,7 @@ mkDerivation rec {
|
||||
repo = "functional-linear-algebra";
|
||||
owner = "ryanorendorff";
|
||||
rev = "v${version}";
|
||||
sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0";
|
||||
sha256 = "GrTeMEHEXb0t2RgHWiGfvvofNYl8YYaaoCE18JrG6Q4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
@ -26,6 +26,5 @@ mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ryanorendorff ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "12.6.5";
|
||||
version = "12.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM=";
|
||||
hash = "sha256-OFiw/UMXcq8DKtPzXCrrVOjavqWRaefR6fzNeLyCrTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/hoene/libmysofa";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -2,19 +2,20 @@
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, nix-update-script
|
||||
, openssl
|
||||
, pkg-config
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gensio";
|
||||
version = "2.6.2";
|
||||
version = "2.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lpP/pmM06zIw+9EZe+zywExLOcrN3K7IMK32XSrCmYs=";
|
||||
sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "General Stream I/O";
|
||||
homepage = "https://sourceforge.net/projects/ser2net/";
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
pname = "commons-compress";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-VQzXg16rnrghsRY2H3NnGJ+0HEbz8/Num7Xlm9pEqqw=";
|
||||
sha256 = "sha256-isxV/gTOjVQW3716cr8ZrlLnOn8YWWr6p1SHYlwhdvA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
@ -6,6 +7,8 @@ stdenv.mkDerivation {
|
||||
pname = "libndtypes";
|
||||
version = "unstable-2019-08-01";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xnd-project";
|
||||
repo = "ndtypes";
|
||||
|
@ -0,0 +1,22 @@
|
||||
diff --git a/cmake/Modules/FindLua52.cmake b/cmake/Modules/FindLua52.cmake
|
||||
index f4398e4..17377c0 100644
|
||||
--- a/cmake/Modules/FindLua52.cmake
|
||||
+++ b/cmake/Modules/FindLua52.cmake
|
||||
@@ -61,7 +61,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
|
||||
)
|
||||
|
||||
FIND_LIBRARY(_LUA_LIBRARY_RELEASE
|
||||
- NAMES lua52 lua5.2 lua-5.2 lua
|
||||
+ NAMES lua52 lua5.2 lua-5.2 lua luajit-5.1
|
||||
HINTS
|
||||
$ENV{LUA_DIR}
|
||||
PATH_SUFFIXES lib64 lib
|
||||
@@ -75,7 +75,7 @@ FIND_LIBRARY(_LUA_LIBRARY_RELEASE
|
||||
)
|
||||
|
||||
FIND_LIBRARY(_LUA_LIBRARY_DEBUG
|
||||
- NAMES lua52-d lua5.2-d lua-5.2-d lua-d
|
||||
+ NAMES lua52-d lua5.2-d lua-5.2-d lua-d luajit-5.1-d
|
||||
HINTS
|
||||
$ENV{LUA_DIR}
|
||||
PATH_SUFFIXES lib64 lib
|
@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
|
||||
inherit lua;
|
||||
};
|
||||
|
||||
patches = [./0.9.1-discover-luajit.patch];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/luabind/luabind";
|
||||
homepage = "https://github.com/Oberon00/luabind";
|
||||
description = "A library that helps you create bindings between C++ and Lua";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php";
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minizip-ng";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zlib-ng";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw=";
|
||||
hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
@ -34,32 +34,32 @@ let
|
||||
|
||||
oneapi-mkl = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-BeI5zB0rrE6C21dezNc7/WSKmTWpjsZbpg0/y0Y87VQ=";
|
||||
hash = "sha256-PGLPNnR+11AmmaNxldeze/l2Kw/4+mfjB+RqsPhP6oM=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-NjIqTeFppwjXFlPYHPHfZa/bWBiHJru3atC4fIMXN0w=";
|
||||
hash = "sha256-wztTE2R/IdG6ujGf7KFocpRmXzlZSnEKopTBOlPPlBw=";
|
||||
};
|
||||
|
||||
oneapi-mkl-common-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
|
||||
hash = "sha256-GX19dlvBWRgwSOCmWcEOrnbmp4S2j0448fWpx+iPVWw=";
|
||||
hash = "sha256-MWa8mpyFM4zgDLup+EzFRM+N2Oxf0o6FBBRM8mAanbI=";
|
||||
};
|
||||
|
||||
oneapi-mkl-devel = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
|
||||
hash = "sha256-F4XxtSPAjNaShEL/l44jJK+JdOOkYI19X/njRB6FkNw=";
|
||||
hash = "sha256-Arq5kXktI92031XqfV0pkzQCHaFsTRKX05iOA/fPNOs=";
|
||||
};
|
||||
|
||||
oneapi-openmp = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
|
||||
hash = "sha256-1SlkI01DxFvwGPBJ73phs86ka0SmCrniwiXQ9DJwIXw=";
|
||||
hash = "sha256-cyBD3P4AEvyreP4pP3BE+yyDB+ptblOQ9GYI8ysGsIM=";
|
||||
};
|
||||
|
||||
oneapi-tbb = fetchurl {
|
||||
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm";
|
||||
hash = "sha256-wIktdf1p1SS1KrnUlc8LPkm0r9dhZE6cQNr4ZKTWI6A=";
|
||||
hash = "sha256-pzJpQdiYVpcKDShePak2I0uEh7u08vJgX7OBF5p5yAM=";
|
||||
};
|
||||
|
||||
in stdenvNoCC.mkDerivation ({
|
||||
|
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/nothings/stb";
|
||||
license = licenses.publicDomain;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vulkan-utility-libraries";
|
||||
version = "1.3.270";
|
||||
version = "1.3.268";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Utility-Libraries";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-P1v5UEAooTDGA10K4uck8lhcrbW2ccl44gWIGVnZ6uo=";
|
||||
hash = "sha256-O1agpzZpXiQZFYx1jPosIhxJovZtfZSLBNFj1LVB1VI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user