forked from mirrors/nixpkgs
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
55843b9385
6
.github/CODEOWNERS
vendored
6
.github/CODEOWNERS
vendored
|
|
@ -298,9 +298,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
|||
/doc/languages-frameworks/javascript.section.md @winterqt
|
||||
|
||||
# OCaml
|
||||
/pkgs/build-support/ocaml @romildo @ulrikstrid
|
||||
/pkgs/development/compilers/ocaml @romildo @ulrikstrid
|
||||
/pkgs/development/ocaml-modules @romildo @ulrikstrid
|
||||
/pkgs/build-support/ocaml @ulrikstrid
|
||||
/pkgs/development/compilers/ocaml @ulrikstrid
|
||||
/pkgs/development/ocaml-modules @ulrikstrid
|
||||
|
||||
# ZFS
|
||||
pkgs/os-specific/linux/zfs @raitobezarius
|
||||
|
|
|
|||
|
|
@ -66,9 +66,12 @@ Useful git commands that can help a lot with this are `git commit --patch --amen
|
|||
From time to time, changes between branches must be rebased, for example, if the
|
||||
number of new rebuilds they would cause is too large for the target branch. When
|
||||
rebasing, care must be taken to include only the intended changes, otherwise
|
||||
many CODEOWNERS will be inadvertently requested for review. To achieve this,
|
||||
many CODEOWNERS will be inadvertently requested for review. To achieve this,
|
||||
rebasing should not be performed directly on the target branch, but on the merge
|
||||
base between the current and target branch.
|
||||
base between the current and target branch. As an additional precautionary measure,
|
||||
you should temporarily mark the PR as draft for the duration of the operation.
|
||||
This reduces the probability of mass-pinging people. (OfBorg might still
|
||||
request a couple of persons for reviews though.)
|
||||
|
||||
In the following example, we assume that the current branch, called `feature`,
|
||||
is based on `master`, and we rebase it onto the merge base between
|
||||
|
|
@ -102,6 +105,36 @@ git status
|
|||
git push origin feature --force-with-lease
|
||||
```
|
||||
|
||||
### Something went wrong and a lot of people were pinged
|
||||
|
||||
It happens. Remember to be kind, especially to new contributors.
|
||||
There is no way back, so the pull request should be closed and locked
|
||||
(if possible). The changes should be re-submitted in a new PR, in which the people
|
||||
originally involved in the conversation need to manually be pinged again.
|
||||
No further discussion should happen on the original PR, as a lot of people
|
||||
are now subscribed to it.
|
||||
|
||||
The following message (or a version thereof) might be left when closing to
|
||||
describe the situation, since closing and locking without any explanation
|
||||
is kind of rude:
|
||||
|
||||
```markdown
|
||||
It looks like you accidentally mass-pinged a bunch of people, which are now subscribed
|
||||
and getting notifications for everything in this pull request. Unfortunately, they
|
||||
cannot be automatically unsubscribed from the issue (removing review request does not
|
||||
unsubscribe), therefore development cannot continue in this pull request anymore.
|
||||
|
||||
Please open a new pull request with your changes, link back to this one and ping the
|
||||
people actually involved in here over there.
|
||||
|
||||
In order to avoid this in the future, there are instructions for how to properly
|
||||
rebase between branches in our [contribution guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging).
|
||||
Setting your pull request to draft prior to rebasing is strongly recommended.
|
||||
In draft status, you can preview the list of people that are about to be requested
|
||||
for review, which allows you to sidestep this issue.
|
||||
This is not a bulletproof method though, as OfBorg still does review requests even on draft PRs.
|
||||
```
|
||||
|
||||
## Backporting changes
|
||||
|
||||
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ builders-use-substitutes = true
|
|||
$ sudo launchctl kickstart -k system/org.nixos.nix-daemon
|
||||
```
|
||||
|
||||
## Example flake usage
|
||||
## Example flake usage {#sec-darwin-builder-example-flake}
|
||||
|
||||
```
|
||||
{
|
||||
|
|
@ -120,7 +120,7 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
|
|||
}
|
||||
```
|
||||
|
||||
## Reconfiguring the builder
|
||||
## Reconfiguring the builder {#sec-darwin-builder-reconfiguring}
|
||||
|
||||
Initially you should not change the builder configuration else you will not be
|
||||
able to use the binary cache. However, after you have the builder running locally
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ pkgs.makeSetupHook {
|
|||
} ./script.sh
|
||||
```
|
||||
|
||||
#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example}
|
||||
### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example}
|
||||
|
||||
```nix
|
||||
pkgs.makeSetupHook {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ A set of VM related utilities, that help in building some packages in more advan
|
|||
|
||||
A bash script fragment that produces a disk image at `destination`.
|
||||
|
||||
### Attributes
|
||||
### Attributes {#vm-tools-createEmptyImage-attributes}
|
||||
|
||||
* `size`. The disk size, in MiB.
|
||||
* `fullName`. Name that will be written to `${destination}/nix-support/full-name`.
|
||||
|
|
@ -20,14 +20,14 @@ Thus, any pure Nix derivation should run unmodified.
|
|||
|
||||
If the build fails and Nix is run with the `-K/--keep-failed` option, a script `run-vm` will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively.
|
||||
|
||||
### Attributes
|
||||
### Attributes {#vm-tools-runInLinuxVM-attributes}
|
||||
|
||||
* `preVM` (optional). Shell command to be evaluated *before* the VM is started (i.e., on the host).
|
||||
* `memSize` (optional, default `512`). The memory size of the VM in MiB.
|
||||
* `diskImage` (optional). A file system image to be attached to `/dev/sda`.
|
||||
Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
|
||||
|
||||
### Examples
|
||||
### Examples {#vm-tools-runInLinuxVM-examples}
|
||||
|
||||
Build the derivation hello inside a VM:
|
||||
```nix
|
||||
|
|
@ -56,13 +56,13 @@ runInLinuxVM (hello.overrideAttrs (_: {
|
|||
|
||||
Takes a file, such as an ISO, and extracts its contents into the store.
|
||||
|
||||
### Attributes
|
||||
### Attributes {#vm-tools-extractFs-attributes}
|
||||
|
||||
* `file`. Path to the file to be extracted.
|
||||
Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
|
||||
* `fs` (optional). Filesystem of the contents of the file.
|
||||
|
||||
### Examples
|
||||
### Examples {#vm-tools-extractFs-examples}
|
||||
|
||||
Extract the contents of an ISO file:
|
||||
```nix
|
||||
|
|
@ -82,7 +82,7 @@ Like [](#vm-tools-runInLinuxVM), but instead of using `stdenv` from the Nix stor
|
|||
|
||||
Generate a script that can be used to run an interactive session in the given image.
|
||||
|
||||
### Examples
|
||||
### Examples {#vm-tools-makeImageTestScript-examples}
|
||||
|
||||
Create a script for running a Fedora 27 VM:
|
||||
```nix
|
||||
|
|
@ -100,7 +100,7 @@ makeImageTestScript diskImages.ubuntu2004x86_64
|
|||
|
||||
A set of functions that build a predefined set of minimal Linux distributions images.
|
||||
|
||||
### Images
|
||||
### Images {#vm-tools-diskImageFuns-images}
|
||||
|
||||
* Fedora
|
||||
* `fedora26x86_64`
|
||||
|
|
@ -126,12 +126,12 @@ A set of functions that build a predefined set of minimal Linux distributions im
|
|||
* `debian11i386`
|
||||
* `debian11x86_64`
|
||||
|
||||
### Attributes
|
||||
### Attributes {#vm-tools-diskImageFuns-attributes}
|
||||
|
||||
* `size` (optional, defaults to `4096`). The size of the image, in MiB.
|
||||
* `extraPackages` (optional). A list names of additional packages from the distribution that should be included in the image.
|
||||
|
||||
### Examples
|
||||
### Examples {#vm-tools-diskImageFuns-examples}
|
||||
|
||||
8GiB image containing Firefox in addition to the default packages:
|
||||
```nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Testers {#chap-testers}
|
||||
This chapter describes several testing builders which are available in the <literal>testers</literal> namespace.
|
||||
This chapter describes several testing builders which are available in the `testers` namespace.
|
||||
|
||||
## `hasPkgConfigModule` {#tester-hasPkgConfigModule}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### Autoconf {#setup-hook-autoconf}
|
||||
# Autoconf {#setup-hook-autoconf}
|
||||
|
||||
The `autoreconfHook` derivation adds `autoreconfPhase`, which runs autoreconf, libtoolize and automake, essentially preparing the configure script in autotools-based builds. Most autotools-based packages come with the configure script pre-generated, but this hook is necessary for a few packages and when you need to patch the package’s configure scripts.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### Automake {#setup-hook-automake}
|
||||
# Automake {#setup-hook-automake}
|
||||
|
||||
Adds the `share/aclocal` subdirectory of each build input to the `ACLOCAL_PATH` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
### autoPatchelfHook {#setup-hook-autopatchelfhook}
|
||||
# autoPatchelfHook {#setup-hook-autopatchelfhook}
|
||||
|
||||
This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given `buildInputs` and `nativeBuildInputs`.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
### breakpointHook {#breakpointhook}
|
||||
# breakpointHook {#breakpointhook}
|
||||
|
||||
This hook will make a build pause instead of stopping when a failure happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the `cntr` command. Upon build error it will print instructions on how to use `cntr`, which can be used to enter the environment for debugging. Installing cntr and running the command will provide shell access to the build sandbox of failed build. At `/var/lib/cntr` the sandboxed filesystem is mounted. All commands and files of the system are still accessible within the shell. To execute commands from the sandbox use the cntr exec subcommand. `cntr` is only supported on Linux-based platforms. To use it first add `cntr` to your `environment.systemPackages` on NixOS or alternatively to the root user on non-NixOS systems. Then in the package that is supposed to be inspected, add `breakpointHook` to `nativeBuildInputs`.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### cmake {#cmake}
|
||||
# cmake {#cmake}
|
||||
|
||||
Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### gdk-pixbuf {#setup-hook-gdk-pixbuf}
|
||||
# gdk-pixbuf {#setup-hook-gdk-pixbuf}
|
||||
|
||||
Exports `GDK_PIXBUF_MODULE_FILE` environment variable to the builder. Add librsvg package to `buildInputs` to get svg support. See also the [setup hook description in GNOME platform docs](#ssec-gnome-hooks-gdk-pixbuf).
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### GHC {#ghc}
|
||||
# GHC {#ghc}
|
||||
|
||||
Creates a temporary package database and registers every Haskell build input in it (TODO: how?).
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### GNOME platform {#gnome-platform}
|
||||
# GNOME platform {#gnome-platform}
|
||||
|
||||
Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in [](#sec-language-gnome).
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
### `installShellFiles` {#installshellfiles}
|
||||
# `installShellFiles` {#installshellfiles}
|
||||
|
||||
This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### libiconv, libintl {#libiconv-libintl}
|
||||
# libiconv, libintl {#libiconv-libintl}
|
||||
|
||||
A few libraries automatically add to `NIX_LDFLAGS` their library, making their symbols automatically available to the linker. This includes libiconv and libintl (gettext). This is done to provide compatibility between GNU Linux, where libiconv and libintl are bundled in, and other systems where that might not be the case. Sometimes, this behavior is not desired. To disable this behavior, set `dontAddExtraLibs`.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### libxml2 {#setup-hook-libxml2}
|
||||
# libxml2 {#setup-hook-libxml2}
|
||||
|
||||
Adds every file named `catalog.xml` found under the `xml/dtd` and `xml/xsl` subdirectories of each build input to the `XML_CATALOG_FILES` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,26 +1,25 @@
|
|||
|
||||
### Meson {#meson}
|
||||
# Meson {#meson}
|
||||
|
||||
Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere.
|
||||
|
||||
#### Variables controlling Meson {#variables-controlling-meson}
|
||||
## Variables controlling Meson {#variables-controlling-meson}
|
||||
|
||||
##### `mesonFlags` {#mesonflags}
|
||||
### `mesonFlags` {#mesonflags}
|
||||
|
||||
Controls the flags passed to meson.
|
||||
|
||||
##### `mesonBuildType` {#mesonbuildtype}
|
||||
### `mesonBuildType` {#mesonbuildtype}
|
||||
|
||||
Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`.
|
||||
|
||||
##### `mesonAutoFeatures` {#mesonautofeatures}
|
||||
### `mesonAutoFeatures` {#mesonautofeatures}
|
||||
|
||||
What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`.
|
||||
|
||||
##### `mesonWrapMode` {#mesonwrapmode}
|
||||
### `mesonWrapMode` {#mesonwrapmode}
|
||||
|
||||
What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access.
|
||||
|
||||
##### `dontUseMesonConfigure` {#dontusemesonconfigure}
|
||||
### `dontUseMesonConfigure` {#dontusemesonconfigure}
|
||||
|
||||
Disables using Meson’s `configurePhase`.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### ninja {#ninja}
|
||||
# ninja {#ninja}
|
||||
|
||||
Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### Perl {#setup-hook-perl}
|
||||
# Perl {#setup-hook-perl}
|
||||
|
||||
Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### pkg-config {#setup-hook-pkg-config}
|
||||
# pkg-config {#setup-hook-pkg-config}
|
||||
|
||||
Adds the `lib/pkgconfig` and `share/pkgconfig` subdirectories of each build input to the `PKG_CONFIG_PATH` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### Python {#setup-hook-python}
|
||||
# Python {#setup-hook-python}
|
||||
|
||||
Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### Qt 4 {#qt-4}
|
||||
# Qt 4 {#qt-4}
|
||||
|
||||
Sets the `QTDIR` environment variable to Qt’s path.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### scons {#scons}
|
||||
# scons {#scons}
|
||||
|
||||
Overrides the build, install, and check phases. This uses the scons build system as a replacement for make. scons does not provide a configure phase, so everything is managed at build and install time.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### teTeX / TeX Live {#tetex-tex-live}
|
||||
# teTeX / TeX Live {#tetex-tex-live}
|
||||
|
||||
Adds the `share/texmf-nix` subdirectory of each build input to the `TEXINPUTS` environment variable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### unzip {#unzip}
|
||||
# unzip {#unzip}
|
||||
|
||||
This setup hook will allow you to unzip .zip files specified in `$src`. There are many similar packages like `unrar`, `undmg`, etc.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### validatePkgConfig {#validatepkgconfig}
|
||||
# validatePkgConfig {#validatepkgconfig}
|
||||
|
||||
The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package. This helps catching some common errors in pkg-config files, such as undefined variables.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### wafHook {#wafhook}
|
||||
# wafHook {#wafhook}
|
||||
|
||||
Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
### xcbuildHook {#xcbuildhook}
|
||||
# xcbuildHook {#xcbuildhook}
|
||||
|
||||
Overrides the build and install phases to run the "xcbuild" command. This hook is needed when a project only comes with build files for the XCode build system. You can disable this behavior by setting buildPhase and configurePhase to a custom value. xcbuildFlags controls flags passed only to xcbuild.
|
||||
|
|
|
|||
|
|
@ -41,32 +41,18 @@ The function is implemented in [pkgs/development/bower-modules/generic/default.n
|
|||
|
||||
### Example buildBowerComponents {#ex-buildBowerComponents}
|
||||
|
||||
```{=docbook}
|
||||
<programlisting language="nix">
|
||||
```nix
|
||||
bowerComponents = buildBowerComponents {
|
||||
name = "my-web-app";
|
||||
generated = ./bower-packages.nix; <co xml:id="ex-buildBowerComponents-1" />
|
||||
src = myWebApp; <co xml:id="ex-buildBowerComponents-2" />
|
||||
generated = ./bower-packages.nix; # note 1
|
||||
src = myWebApp; # note 2
|
||||
};
|
||||
</programlisting>
|
||||
```
|
||||
|
||||
In ["buildBowerComponents" example](#ex-buildBowerComponents) the following arguments are of special significance to the function:
|
||||
|
||||
```{=docbook}
|
||||
<calloutlist>
|
||||
<callout arearefs="ex-buildBowerComponents-1">
|
||||
<para>
|
||||
<varname>generated</varname> specifies the file which was created by <command>bower2nix</command>.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs="ex-buildBowerComponents-2">
|
||||
<para>
|
||||
<varname>src</varname> is your project's sources. It needs to contain a <filename>bower.json</filename> file.
|
||||
</para>
|
||||
</callout>
|
||||
</calloutlist>
|
||||
```
|
||||
1. `generated` specifies the file which was created by {command}`bower2nix`.
|
||||
2. `src` is your project's sources. It needs to contain a {file}`bower.json` file.
|
||||
|
||||
`buildBowerComponents` will run Bower to link together the output of `bower2nix`, resulting in a `bower_components` directory which can be used.
|
||||
|
||||
|
|
@ -91,10 +77,9 @@ gulp.task('build', [], function () {
|
|||
|
||||
### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix}
|
||||
|
||||
```{=docbook}
|
||||
<programlisting language="nix">
|
||||
```nix
|
||||
{ myWebApp ? { outPath = ./.; name = "myWebApp"; }
|
||||
, pkgs ? import <nixpkgs> {}
|
||||
, pkgs ? import <nixpkgs> {}
|
||||
}:
|
||||
|
||||
pkgs.stdenv.mkDerivation {
|
||||
|
|
@ -103,49 +88,29 @@ pkgs.stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ pkgs.nodePackages.gulp ];
|
||||
|
||||
bowerComponents = pkgs.buildBowerComponents { <co xml:id="ex-buildBowerComponentsDefault-1" />
|
||||
bowerComponents = pkgs.buildBowerComponents { # note 1
|
||||
name = "my-web-app";
|
||||
generated = ./bower-packages.nix;
|
||||
src = myWebApp;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . <co xml:id="ex-buildBowerComponentsDefault-2" />
|
||||
export HOME=$PWD <co xml:id="ex-buildBowerComponentsDefault-3" />
|
||||
${pkgs.nodePackages.gulp}/bin/gulp build <co xml:id="ex-buildBowerComponentsDefault-4" />
|
||||
cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2
|
||||
export HOME=$PWD # note 3
|
||||
${pkgs.nodePackages.gulp}/bin/gulp build # note 4
|
||||
'';
|
||||
|
||||
installPhase = "mv gulpdist $out";
|
||||
}
|
||||
</programlisting>
|
||||
```
|
||||
|
||||
A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefaultNix):
|
||||
|
||||
```{=docbook}
|
||||
<calloutlist>
|
||||
<callout arearefs="ex-buildBowerComponentsDefault-1">
|
||||
<para>
|
||||
The result of <varname>buildBowerComponents</varname> is an input to the frontend build.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs="ex-buildBowerComponentsDefault-2">
|
||||
<para>
|
||||
Whether to symlink or copy the <filename>bower_components</filename> directory depends on the build tool in use. In this case a copy is used to avoid <command>gulp</command> silliness with permissions.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs="ex-buildBowerComponentsDefault-3">
|
||||
<para>
|
||||
<command>gulp</command> requires <varname>HOME</varname> to refer to a writeable directory.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs="ex-buildBowerComponentsDefault-4">
|
||||
<para>
|
||||
The actual build command. Other tools could be used.
|
||||
</para>
|
||||
</callout>
|
||||
</calloutlist>
|
||||
```
|
||||
1. The result of `buildBowerComponents` is an input to the frontend build.
|
||||
2. Whether to symlink or copy the {file}`bower_components` directory depends on the build tool in use.
|
||||
In this case a copy is used to avoid {command}`gulp` silliness with permissions.
|
||||
3. {command}`gulp` requires `HOME` to refer to a writeable directory.
|
||||
4. The actual build command in this example is {command}`gulp`. Other tools could be used instead.
|
||||
|
||||
## Troubleshooting {#ssec-bower2nix-troubleshooting}
|
||||
|
||||
|
|
|
|||
|
|
@ -137,15 +137,15 @@ Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is the
|
|||
|
||||
## Frequently encountered issues {#ssec-gnome-common-issues}
|
||||
|
||||
#### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas}
|
||||
### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas}
|
||||
|
||||
There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGAppsHook`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used.
|
||||
|
||||
#### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema}
|
||||
### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema}
|
||||
|
||||
Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas).
|
||||
|
||||
#### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}
|
||||
### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}
|
||||
|
||||
This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGAppsHook` automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another.
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ mkDerivation {
|
|||
}
|
||||
```
|
||||
|
||||
#### I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. {#ssec-gnome-common-issues-unwrappable-package}
|
||||
### I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. {#ssec-gnome-common-issues-unwrappable-package}
|
||||
|
||||
You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
|
||||
|
||||
|
|
@ -209,6 +209,6 @@ You can rely on applications depending on the library setting the necessary envi
|
|||
|
||||
[]{#ssec-gnome-common-issues-unwrappable-package-gsettings-c} [Hard-coding GSettings schema path in C library](https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34) – nothing special other than using [Coccinelle patch](https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467) to generate the patch itself.
|
||||
|
||||
#### I need to wrap a binary outside `bin` and `libexec` directories. {#ssec-gnome-common-issues-weird-location}
|
||||
### I need to wrap a binary outside `bin` and `libexec` directories. {#ssec-gnome-common-issues-weird-location}
|
||||
|
||||
You can manually trigger the wrapping with `wrapGApp` in `preFixup` phase. It takes a path to a program as a first argument; the remaining arguments are passed directly to [`wrapProgram`](#fun-wrapProgram) function.
|
||||
|
|
|
|||
|
|
@ -10,37 +10,22 @@ pure and explicit at build-time, at the cost of introducing an extra indirection
|
|||
|
||||
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
|
||||
|
||||
```{=docbook}
|
||||
<programlisting>
|
||||
{ stdenv, lib, qtbase, wrapQtAppsHook }: <co xml:id='qt-default-nix-co-1' />
|
||||
```nix
|
||||
{ stdenv, lib, qtbase, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "myapp";
|
||||
version = "1.0";
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook ]; <co xml:id='qt-default-nix-co-2' />
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
}
|
||||
</programlisting>
|
||||
|
||||
<calloutlist>
|
||||
<callout arearefs='qt-default-nix-co-1'>
|
||||
<para>
|
||||
Import Qt modules directly, that is: <literal>qtbase</literal>, <literal>qtdeclarative</literal>, etc.
|
||||
<emphasis>Do not</emphasis> import Qt package sets such as <literal>qt5</literal>
|
||||
because the Qt versions of dependencies may not be coherent, causing build and runtime failures.
|
||||
</para>
|
||||
</callout>
|
||||
<callout arearefs='qt-default-nix-co-2'>
|
||||
<para>
|
||||
All Qt packages must include <literal>wrapQtAppsHook</literal> in
|
||||
<literal>nativeBuildInputs</literal>, or you must explicitly set
|
||||
<literal>dontWrapQtApps</literal>.
|
||||
</para>
|
||||
</callout>
|
||||
</calloutlist>
|
||||
```
|
||||
|
||||
It is important to import Qt modules directly, that is: `qtbase`, `qtdeclarative`, etc. *Do not* import Qt package sets such as `qt5` because the Qt versions of dependencies may not be coherent, causing build and runtime failures.
|
||||
|
||||
Additionally all Qt packages must include `wrapQtAppsHook` in `nativeBuildInputs`, or you must explicitly set `dontWrapQtApps`.
|
||||
|
||||
## Locating runtime dependencies {#qt-runtime-dependencies}
|
||||
|
||||
Qt applications must be wrapped to find runtime dependencies.
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ Prefer `passthru.tests` for tests that are introduced in nixpkgs because:
|
|||
* we can run `passthru.tests` independently
|
||||
* `installCheckPhase` adds overhead to each build
|
||||
|
||||
For more on how to write and run package tests, see <xref linkend="sec-package-tests"/>.
|
||||
For more on how to write and run package tests, see [](#sec-package-tests).
|
||||
|
||||
#### NixOS tests {#var-meta-tests-nixos}
|
||||
|
||||
|
|
|
|||
|
|
@ -971,7 +971,8 @@ to `~/.gdbinit`. GDB will then be able to find debug information installed via `
|
|||
|
||||
The installCheck phase checks whether the package was installed correctly by running its test suite against the installed directories. The default `installCheck` calls `make installcheck`.
|
||||
|
||||
It is often better to add tests that are not part of the source distribution to `passthru.tests` (see <xref linkend="var-meta-tests"/>). This avoids adding overhead to every build and enables us to run them independently.
|
||||
It is often better to add tests that are not part of the source distribution to `passthru.tests` (see
|
||||
[](#var-meta-tests)). This avoids adding overhead to every build and enables us to run them independently.
|
||||
|
||||
#### Variables controlling the installCheck phase {#variables-controlling-the-installcheck-phase}
|
||||
|
||||
|
|
@ -1234,7 +1235,7 @@ This runs the strip command on installed binaries and libraries. This removes un
|
|||
|
||||
This setup hook patches installed scripts to add Nix store paths to their shebang interpreter as found in the build environment. The [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) line tells a Unix-like operating system which interpreter to use to execute the script's contents.
|
||||
|
||||
::: note
|
||||
::: {.note}
|
||||
The [generic builder][generic-builder] populates `PATH` from inputs of the derivation.
|
||||
:::
|
||||
|
||||
|
|
@ -1272,7 +1273,7 @@ patchShebangs --build configure
|
|||
|
||||
Interpreter paths that point to a valid Nix store location are not changed.
|
||||
|
||||
::: note
|
||||
::: {.note}
|
||||
A script file must be marked as executable, otherwise it will not be
|
||||
considered.
|
||||
:::
|
||||
|
|
|
|||
|
|
@ -2222,6 +2222,13 @@
|
|||
githubId = 68566724;
|
||||
name = "bootstrap-prime";
|
||||
};
|
||||
boozedog = {
|
||||
email = "code@booze.dog";
|
||||
github = "boozedog";
|
||||
githubId = 1410808;
|
||||
matrix = "@boozedog:matrix.org";
|
||||
name = "David A. Buser";
|
||||
};
|
||||
borisbabic = {
|
||||
email = "boris.ivan.babic@gmail.com";
|
||||
github = "borisbabic";
|
||||
|
|
@ -10811,6 +10818,12 @@
|
|||
fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3";
|
||||
}];
|
||||
};
|
||||
moody = {
|
||||
email = "moody@posixcafe.org";
|
||||
github = "majiru";
|
||||
githubId = 3579600;
|
||||
name = "Jacob Moody";
|
||||
};
|
||||
moosingin3space = {
|
||||
email = "moosingin3space@gmail.com";
|
||||
github = "moosingin3space";
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ In addition to numerous new and updated packages, this release has the following
|
|||
|
||||
- `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.
|
||||
|
||||
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
|
||||
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
|
||||
|
||||
- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).
|
||||
|
||||
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
|
||||
|
||||
- [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
||||
|
|
|
|||
|
|
@ -1190,6 +1190,7 @@
|
|||
./services/web-apps/galene.nix
|
||||
./services/web-apps/gerrit.nix
|
||||
./services/web-apps/gotify-server.nix
|
||||
./services/web-apps/gotosocial.nix
|
||||
./services/web-apps/grocy.nix
|
||||
./services/web-apps/pixelfed.nix
|
||||
./services/web-apps/healthchecks.nix
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
default = null;
|
||||
description = lib.mdDoc description;
|
||||
type = types.nullOr types.lines;
|
||||
} // (if example == null then {} else { inherit example; });
|
||||
} // (lib.optionalAttrs (example != null) { inherit example; });
|
||||
};
|
||||
mkHookOptions = hooks: listToAttrs (map mkHookOption hooks);
|
||||
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ let
|
|||
text = v.extraConfig;
|
||||
})
|
||||
(filterAttrs (n: v: v.extraConfig != "") cfg.workers))
|
||||
// (if cfg.extraConfig == "" then {} else {
|
||||
// (lib.optionalAttrs (cfg.extraConfig != "") {
|
||||
"extra-config.inc".text = cfg.extraConfig;
|
||||
});
|
||||
in
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ let
|
|||
"ipmi"
|
||||
"json"
|
||||
"jitsi"
|
||||
"junos-czerwonk"
|
||||
"kea"
|
||||
"keylight"
|
||||
"knot"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.junos-czerwonk;
|
||||
|
||||
configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configurationFile);
|
||||
|
||||
configurationFile = pkgs.writeText "prometheus-junos-czerwonk-exporter.conf" (builtins.toJSON (cfg.configuration));
|
||||
in
|
||||
{
|
||||
port = 9326;
|
||||
extraOpts = {
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
File containing env-vars to be substituted into the exporter's config.
|
||||
'';
|
||||
};
|
||||
configurationFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Specify the JunOS exporter configuration file to use.
|
||||
'';
|
||||
};
|
||||
configuration = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
JunOS exporter configuration as nix attribute set. Mutually exclusive with the `configurationFile` option.
|
||||
'';
|
||||
example = {
|
||||
devices = [
|
||||
{
|
||||
host = "router1";
|
||||
key_file = "/path/to/key";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
telemetryPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/metrics";
|
||||
description = lib.mdDoc ''
|
||||
Path under which to expose metrics.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
DynamicUser = false;
|
||||
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
|
||||
RuntimeDirectory = "prometheus-junos-czerwonk-exporter";
|
||||
ExecStartPre = [
|
||||
"${pkgs.writeShellScript "subst-secrets-junos-czerwonk-exporter" ''
|
||||
umask 0077
|
||||
${pkgs.envsubst}/bin/envsubst -i ${configFile} -o ''${RUNTIME_DIRECTORY}/junos-exporter.json
|
||||
''}"
|
||||
];
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-junos-czerwonk-exporter}/bin/junos_exporter \
|
||||
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
-web.telemetry-path ${cfg.telemetryPath} \
|
||||
-config.file ''${RUNTIME_DIRECTORY}/junos-exporter.json \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
64
nixos/modules/services/web-apps/gotosocial.md
Normal file
64
nixos/modules/services/web-apps/gotosocial.md
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
# GoToSocial {#module-services-gotosocial}
|
||||
|
||||
[GoToSocial](https://gotosocial.org/) is an ActivityPub social network server, written in Golang.
|
||||
|
||||
## Service configuration {#modules-services-gotosocial-service-configuration}
|
||||
|
||||
The following configuration sets up the PostgreSQL as database backend and binds
|
||||
GoToSocial to `127.0.0.1:8080`, expecting to be run behind a HTTP proxy on `gotosocial.example.com`.
|
||||
|
||||
```nix
|
||||
services.gotosocial = {
|
||||
enable = true;
|
||||
setupPostgresqlDB = true;
|
||||
settings = {
|
||||
application-name = "My GoToSocial";
|
||||
host = "gotosocial.example.com";
|
||||
protocol = "https";
|
||||
bind-address = "127.0.0.1";
|
||||
port = 8080;
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
Please refer to the [GoToSocial Documentation](https://docs.gotosocial.org/en/latest/configuration/general/)
|
||||
for additional configuration options.
|
||||
|
||||
## Proxy configuration {#modules-services-gotosocial-proxy-configuration}
|
||||
|
||||
Although it is possible to expose GoToSocial directly, it is common practice to operate it behind an
|
||||
HTTP reverse proxy such as nginx.
|
||||
|
||||
```nix
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
clientMaxBodySize = "40M";
|
||||
virtualHosts = with config.services.gotosocial.settings; {
|
||||
"${host}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyWebsockets = true;
|
||||
proxyPass = "http://${bind-address}:${toString port}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
Please refer to [](#module-security-acme) for details on how to provision an SSL/TLS certificate.
|
||||
|
||||
## User management {#modules-services-gotosocial-user-management}
|
||||
|
||||
After the GoToSocial service is running, the `gotosocial-admin` utility can be used to manage users. In particular an
|
||||
administrative user can be created with
|
||||
|
||||
```ShellSession
|
||||
$ sudo gotosocial-admin account create --username <nickname> --email <email> --password <password>
|
||||
$ sudo gotosocial-admin account confirm --username <nickname>
|
||||
$ sudo gotosocial-admin account promote --username <nickname>
|
||||
```
|
||||
173
nixos/modules/services/web-apps/gotosocial.nix
Normal file
173
nixos/modules/services/web-apps/gotosocial.nix
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.gotosocial;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
configFile = settingsFormat.generate "config.yml" cfg.settings;
|
||||
defaultSettings = {
|
||||
application-name = "gotosocial";
|
||||
|
||||
protocol = "https";
|
||||
|
||||
bind-address = "127.0.0.1";
|
||||
port = 8080;
|
||||
|
||||
storage-local-base-path = "/var/lib/gotosocial/storage";
|
||||
|
||||
db-type = "sqlite";
|
||||
db-address = "/var/lib/gotosocial/database.sqlite";
|
||||
};
|
||||
gotosocial-admin = pkgs.writeShellScriptBin "gotosocial-admin" ''
|
||||
exec systemd-run \
|
||||
-u gotosocial-admin.service \
|
||||
-p Group=gotosocial \
|
||||
-p User=gotosocial \
|
||||
-q -t -G --wait --service-type=exec \
|
||||
${cfg.package}/bin/gotosocial --config-path ${configFile} admin "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
meta.doc = ./gotosocial.md;
|
||||
meta.maintainers = with lib.maintainers; [ misuzu ];
|
||||
|
||||
options.services.gotosocial = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "ActivityPub social network server");
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "gotosocial" { };
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Open the configured port in the firewall.
|
||||
Using a reverse proxy instead is highly recommended.
|
||||
'';
|
||||
};
|
||||
|
||||
setupPostgresqlDB = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to setup a local postgres database and populate the
|
||||
`db-type` fields in `services.gotosocial.settings`.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
default = defaultSettings;
|
||||
example = {
|
||||
application-name = "My GoToSocial";
|
||||
host = "gotosocial.example.com";
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
Contents of the GoToSocial YAML config.
|
||||
|
||||
Please refer to the
|
||||
[documentation](https://docs.gotosocial.org/en/latest/configuration/)
|
||||
and
|
||||
[example config](https://github.com/superseriousbusiness/gotosocial/blob/main/example/config.yaml).
|
||||
|
||||
Please note that the `host` option cannot be changed later so it is important to configure this correctly before you start GoToSocial.
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
description = lib.mdDoc ''
|
||||
File path containing environment variables for configuring the GoToSocial service
|
||||
in the format of an EnvironmentFile as described by systemd.exec(5).
|
||||
|
||||
This option could be used to pass sensitive configuration to the GoToSocial daemon.
|
||||
|
||||
Please refer to the Environment Variables section in the
|
||||
[documentation](https://docs.gotosocial.org/en/latest/configuration/).
|
||||
'';
|
||||
default = null;
|
||||
example = "/root/nixos/secrets/gotosocial.env";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.settings.host or null != null;
|
||||
message = ''
|
||||
You have to define a hostname for GoToSocial (`services.gotosocial.settings.host`), it cannot be changed later without starting over!
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
services.gotosocial.settings = (lib.mapAttrs (name: lib.mkDefault) (
|
||||
defaultSettings // {
|
||||
web-asset-base-dir = "${cfg.package}/share/gotosocial/web/assets/";
|
||||
web-template-base-dir = "${cfg.package}/share/gotosocial/web/template/";
|
||||
}
|
||||
)) // (lib.optionalAttrs cfg.setupPostgresqlDB {
|
||||
db-type = "postgres";
|
||||
db-address = "/run/postgresql";
|
||||
db-database = "gotosocial";
|
||||
db-user = "gotosocial";
|
||||
});
|
||||
|
||||
environment.systemPackages = [ gotosocial-admin ];
|
||||
|
||||
users.groups.gotosocial = { };
|
||||
users.users.gotosocial = {
|
||||
group = "gotosocial";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.settings.port ];
|
||||
};
|
||||
|
||||
services.postgresql = lib.mkIf cfg.setupPostgresqlDB {
|
||||
enable = true;
|
||||
ensureDatabases = [ "gotosocial" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "gotosocial";
|
||||
ensurePermissions = {
|
||||
"DATABASE gotosocial" = "ALL PRIVILEGES";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.gotosocial = {
|
||||
description = "ActivityPub social network server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ]
|
||||
++ lib.optional cfg.setupPostgresqlDB "postgresql.service";
|
||||
requires = lib.optional cfg.setupPostgresqlDB "postgresql.service";
|
||||
restartTriggers = [ configFile ];
|
||||
|
||||
serviceConfig = {
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
ExecStart = "${cfg.package}/bin/gotosocial --config-path ${configFile} server start";
|
||||
Restart = "on-failure";
|
||||
Group = "gotosocial";
|
||||
User = "gotosocial";
|
||||
StateDirectory = "gotosocial";
|
||||
WorkingDirectory = "/var/lib/gotosocial";
|
||||
|
||||
# Security options:
|
||||
# Based on https://github.com/superseriousbusiness/gotosocial/blob/v0.8.1/example/gotosocial.service
|
||||
AmbientCapabilities = lib.optional (cfg.settings.port < 1024) "CAP_NET_BIND_SERVICE";
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
DevicePolicy = "closed";
|
||||
ProtectSystem = "full";
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
LockPersonality = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -86,8 +86,7 @@ let
|
|||
mattermostConf = recursiveUpdate
|
||||
mattermostConfWithoutPlugins
|
||||
(
|
||||
if mattermostPlugins == null then {}
|
||||
else {
|
||||
lib.optionalAttrs (mattermostPlugins != null) {
|
||||
PluginSettings = {
|
||||
Enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ let
|
|||
cfg = config.services.openvscode-server;
|
||||
defaultUser = "openvscode-server";
|
||||
defaultGroup = defaultUser;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.openvscode-server = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "openvscode-server");
|
||||
|
|
@ -126,12 +127,12 @@ in {
|
|||
};
|
||||
|
||||
telemetryLevel = lib.mkOption {
|
||||
default = "off";
|
||||
default = null;
|
||||
example = "crash";
|
||||
description = lib.mdDoc ''
|
||||
Sets the initial telemetry level. Valid levels are: 'off', 'crash', 'error' and 'all'.
|
||||
'';
|
||||
type = lib.types.str;
|
||||
type = lib.types.nullOr (lib.types.enum [ "off" "crash" "error" "all" ]);
|
||||
};
|
||||
|
||||
connectionToken = lib.mkOption {
|
||||
|
|
@ -167,23 +168,23 @@ in {
|
|||
--accept-server-license-terms \
|
||||
--host=${cfg.host} \
|
||||
--port=${toString cfg.port} \
|
||||
'' + lib.optionalString (cfg.telemetryLevel == true) ''
|
||||
--telemetry-level=${cfg.telemetryLevel} \
|
||||
'' + lib.optionalString (cfg.withoutConnectionToken == true) ''
|
||||
--without-connection-token \
|
||||
'' + lib.optionalString (cfg.socketPath != null) ''
|
||||
--socket-path=${cfg.socketPath} \
|
||||
'' + lib.optionalString (cfg.userDataDir != null) ''
|
||||
--user-data-dir=${cfg.userDataDir} \
|
||||
'' + lib.optionalString (cfg.serverDataDir != null) ''
|
||||
--server-data-dir=${cfg.serverDataDir} \
|
||||
'' + lib.optionalString (cfg.extensionsDir != null) ''
|
||||
--extensions-dir=${cfg.extensionsDir} \
|
||||
'' + lib.optionalString (cfg.connectionToken != null) ''
|
||||
--connection-token=${cfg.connectionToken} \
|
||||
'' + lib.optionalString (cfg.connectionTokenFile != null) ''
|
||||
--connection-token-file=${cfg.connectionTokenFile} \
|
||||
'' + lib.escapeShellArgs cfg.extraArguments;
|
||||
'' + lib.optionalString (cfg.telemetryLevel != null) ''
|
||||
--telemetry-level=${cfg.telemetryLevel} \
|
||||
'' + lib.optionalString (cfg.withoutConnectionToken) ''
|
||||
--without-connection-token \
|
||||
'' + lib.optionalString (cfg.socketPath != null) ''
|
||||
--socket-path=${cfg.socketPath} \
|
||||
'' + lib.optionalString (cfg.userDataDir != null) ''
|
||||
--user-data-dir=${cfg.userDataDir} \
|
||||
'' + lib.optionalString (cfg.serverDataDir != null) ''
|
||||
--server-data-dir=${cfg.serverDataDir} \
|
||||
'' + lib.optionalString (cfg.extensionsDir != null) ''
|
||||
--extensions-dir=${cfg.extensionsDir} \
|
||||
'' + lib.optionalString (cfg.connectionToken != null) ''
|
||||
--connection-token=${cfg.connectionToken} \
|
||||
'' + lib.optionalString (cfg.connectionTokenFile != null) ''
|
||||
--connection-token-file=${cfg.connectionTokenFile} \
|
||||
'' + lib.escapeShellArgs cfg.extraArguments;
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
RuntimeDirectory = cfg.user;
|
||||
User = cfg.user;
|
||||
|
|
|
|||
|
|
@ -306,6 +306,7 @@ in {
|
|||
gonic = handleTest ./gonic.nix {};
|
||||
google-oslogin = handleTest ./google-oslogin {};
|
||||
gotify-server = handleTest ./gotify-server.nix {};
|
||||
gotosocial = runTest ./web-apps/gotosocial.nix;
|
||||
grafana = handleTest ./grafana {};
|
||||
grafana-agent = handleTest ./grafana-agent.nix {};
|
||||
graphite = handleTest ./graphite.nix {};
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ let
|
|||
in {
|
||||
matomo = matomoTest pkgs.matomo // {
|
||||
name = "matomo";
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
|
||||
};
|
||||
matomo-beta = matomoTest pkgs.matomo-beta // {
|
||||
name = "matomo-beta";
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
28
nixos/tests/web-apps/gotosocial.nix
Normal file
28
nixos/tests/web-apps/gotosocial.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
name = "gotosocial";
|
||||
meta.maintainers = with lib.maintainers; [ misuzu ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
services.gotosocial = {
|
||||
enable = true;
|
||||
setupPostgresqlDB = true;
|
||||
settings = {
|
||||
host = "localhost:8081";
|
||||
port = 8081;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("gotosocial.service")
|
||||
machine.wait_for_unit("postgresql.service")
|
||||
machine.wait_for_open_port(8081)
|
||||
|
||||
# check user registration via cli
|
||||
machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^0$'")
|
||||
machine.succeed("gotosocial-admin account create --username nickname --email email@example.com --password kurtz575VPeBgjVm")
|
||||
machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^1$'")
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, gobject-introspection
|
||||
|
|
@ -33,37 +32,24 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "sublime-music";
|
||||
version = "0.11.16";
|
||||
format = "pyproject";
|
||||
version = "0.12.0";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
src = fetchFromGitHub {
|
||||
owner = "sublime-music";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg=";
|
||||
hash = "sha256-FPzeFqDOcaiariz7qJwz6P3Wd+ZDxNP57uj+ptMtEyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
] ++ (with python.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
]);
|
||||
|
||||
# Can be removed in later versions (probably > 0.11.16)
|
||||
pythonRelaxDeps = [
|
||||
"deepdiff"
|
||||
"python-mpv"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/--cov/d" setup.cfg
|
||||
sed -i "/--no-cov-on-fail/d" setup.cfg
|
||||
# https://github.com/sublime-music/sublime-music/pull/370
|
||||
# Can be removed in later versions (probably > 0.11.16)
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python-Levenshtein = "^0.12.0"' 'Levenshtein = ">0.12.0"'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -76,20 +62,20 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
bleach
|
||||
bottle
|
||||
dataclasses-json
|
||||
deepdiff
|
||||
fuzzywuzzy
|
||||
levenshtein
|
||||
mpv
|
||||
peewee
|
||||
pychromecast
|
||||
pygobject3
|
||||
levenshtein
|
||||
python-dateutil
|
||||
requests
|
||||
semver
|
||||
thefuzz
|
||||
]
|
||||
++ lib.optional chromecastSupport pychromecast
|
||||
++ lib.optional keyringSupport keyring
|
||||
++ lib.optional serverSupport bottle
|
||||
;
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, gobject-introspection
|
||||
, gtk3
|
||||
, kissfft
|
||||
, libappindicator
|
||||
, libnotify
|
||||
, libsamplerate
|
||||
, libvorbis
|
||||
|
|
@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
flac
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libappindicator
|
||||
libnotify
|
||||
libopenmpt
|
||||
librsvg
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, help2man
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, which
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libgee
|
||||
|
|
@ -15,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "timeshift";
|
||||
version = "22.11.2";
|
||||
version = "23.06.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "timeshift";
|
||||
rev = version;
|
||||
sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY=";
|
||||
sha256 = "epj0oaV+4lebRxcj6MQ2+lJ3juv9JZ+2UPLRc6UisX4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -29,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./files/meson.build \
|
||||
--replace "/etc/timeshift" "$out/etc/timeshift"
|
||||
while IFS="" read -r -d $'\0' FILE; do
|
||||
substituteInPlace "$FILE" \
|
||||
--replace "/sbin/blkid" "${util-linux}/bin/blkid"
|
||||
|
|
@ -42,9 +46,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
help2man
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -55,14 +61,6 @@ stdenv.mkDerivation rec {
|
|||
xapp
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=( \
|
||||
"-C" "src" \
|
||||
"prefix=$out" \
|
||||
"sysconfdir=$out/etc" \
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A system restore tool for Linux";
|
||||
longDescription = ''
|
||||
|
|
@ -70,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
Snapshots can be restored using TimeShift installed on the system or from Live CD or USB.
|
||||
'';
|
||||
homepage = "https://github.com/linuxmint/timeshift";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ShamrockLee bobby285271 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "groestlcoin" else "groestlcoind";
|
||||
version = "24.0.1";
|
||||
version = "25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Groestlcoin";
|
||||
repo = "groestlcoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k14y3iv5l26r820wzkwqxi67kwh26i0yq20ffd72shicjs1d3qc";
|
||||
sha256 = "03w5n3qjha63mgj7zk8q17x5j63la3i4li7bf5i1yw59ijqpmnqg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]
|
||||
|
|
|
|||
|
|
@ -25,6 +25,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/getAlby/lndhub.go";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.62.1";
|
||||
version = "2.62.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-viJlbBzV6zA/RbdF6kTNbER3ECayqS9hIns60kOa47c=";
|
||||
hash = "sha256-/zIAF3LqOeIN91o33vntkBtQnESJhEDBljGPbMZvelc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ final: prev:
|
|||
|
||||
ChatGPT-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "ChatGPT.nvim";
|
||||
version = "2023-05-26";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackMort";
|
||||
repo = "ChatGPT.nvim";
|
||||
rev = "af509fceb70cab1867a611f3d8fad6d3e7760fb0";
|
||||
sha256 = "0h34m91fm1bpy7zi643y6i0l0zlkbq6r1w6b3xqvnbjjny2zh6md";
|
||||
rev = "b32003f351e330b9985078989b60e70406d63973";
|
||||
sha256 = "0g499ksfyim6blw878h6gcb3v893ipn2sadafygryb17z97g7b3r";
|
||||
};
|
||||
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
|
||||
};
|
||||
|
|
@ -173,12 +173,12 @@ final: prev:
|
|||
|
||||
LazyVim = buildVimPluginFrom2Nix {
|
||||
pname = "LazyVim";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "986a6374f4fd3f9b176105f4a3a4392b24e1953a";
|
||||
sha256 = "1gr3f779phdxaq6m2dbd2swkvwd702s2gnkhbj3vrcs38a9jrbnz";
|
||||
rev = "2e7ad2b8257b7d25df0264a5b193da7af35f5a53";
|
||||
sha256 = "057wak6dx112jzyqfk5lv31z8yl3xcy5rsqxci60zz1sgbpfsq29";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
|
|
@ -365,12 +365,12 @@ final: prev:
|
|||
|
||||
SpaceVim = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceVim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "f4b746a617323610d9a069bae6808ec6ca448bd9";
|
||||
sha256 = "1lp8j3bsz52mzhpjq8lmbf8ws857n71n0kcgvzx6adn74gh3sfl6";
|
||||
rev = "c2e4697ed7cf2b8617ebf65a5cb521544ca1f14f";
|
||||
sha256 = "1p780cxkd6rlkjdd7yhr7783hkjv52swdxw639x4zzzn7bzmaphn";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
|
|
@ -437,12 +437,12 @@ final: prev:
|
|||
|
||||
YouCompleteMe = buildVimPluginFrom2Nix {
|
||||
pname = "YouCompleteMe";
|
||||
version = "2023-04-19";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ycm-core";
|
||||
repo = "YouCompleteMe";
|
||||
rev = "78ba06ef21bfab9835ced9f4ba8ffdac1b975c40";
|
||||
sha256 = "0wr3d5ziwnb2v3fwh5asl1jq9js159qz8q1l8p0y4wx1jbfvryll";
|
||||
rev = "49ced5a30ad7778178fd44703665a8ef3329e592";
|
||||
sha256 = "0grfvb5vl9si7lldvjrlpc648649lwqn41xnb09bmhh8z0g11vx3";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
|
||||
|
|
@ -1195,12 +1195,12 @@ final: prev:
|
|||
|
||||
ccc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "ccc.nvim";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uga-rosa";
|
||||
repo = "ccc.nvim";
|
||||
rev = "5e85133b895b10f7dc7ce46bdad852c990a3f4b9";
|
||||
sha256 = "13c8b6qrc03zblb7pq8ndy76mdb5b5pscbih6gqsx2qb6y9hxz39";
|
||||
rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6";
|
||||
sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg";
|
||||
};
|
||||
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
|
||||
};
|
||||
|
|
@ -1579,12 +1579,12 @@ final: prev:
|
|||
|
||||
cmp-npm = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-npm";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "David-Kunz";
|
||||
repo = "cmp-npm";
|
||||
rev = "713f08c0492efbbe81eebcddc3162e6822bb610b";
|
||||
sha256 = "1s4191aql9b3xjidz2m559s1hsy5cf7hhn3xzb16d365nzin4rwk";
|
||||
rev = "2337f109f51a09297596dd6b538b70ccba92b4e4";
|
||||
sha256 = "1i1kg888wlz7jzmqcsfqr9vv3qwmdl25lsmalddx075ficxix3ga";
|
||||
};
|
||||
meta.homepage = "https://github.com/David-Kunz/cmp-npm/";
|
||||
};
|
||||
|
|
@ -1963,12 +1963,12 @@ final: prev:
|
|||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "b748ff19c7c3fbd0b9e263d04ea58e10954027ff";
|
||||
sha256 = "09qrry6y9k1c20z3q9d1m15a3n1bx1kzf11237fhhc41y2rk3g15";
|
||||
rev = "c045bfe52288b21cff3690bc9c4d5e2dc8a8af2c";
|
||||
sha256 = "07rlz9p709jprsnr11g8gb93y7znjsfa06p7irx6wb3s8p34mi4p";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
|
|
@ -2035,12 +2035,12 @@ final: prev:
|
|||
|
||||
comment-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "comment.nvim";
|
||||
version = "2023-06-01";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "c8043290f2d77f61025494d839d88e414608c460";
|
||||
sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva";
|
||||
rev = "176e85eeb63f1a5970d6b88f1725039d85ca0055";
|
||||
sha256 = "0y3zhv82hi8avxhmp1c9h0r17kfclwxphzyk7701f6wjky375ksw";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
|
|
@ -2191,12 +2191,12 @@ final: prev:
|
|||
|
||||
conjure = buildVimPluginFrom2Nix {
|
||||
pname = "conjure";
|
||||
version = "2023-05-05";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Olical";
|
||||
repo = "conjure";
|
||||
rev = "1dd96d90f53122225f698e58b50dee9ed760cf2e";
|
||||
sha256 = "11x6nlr8ii2kfvkywx5p3lj33xrdpvz5j49s2dvggls6syn1akza";
|
||||
rev = "31a1626273e2bab479b6b8416a137f9edaba7daa";
|
||||
sha256 = "1dcwp8sziahrgks2fdczvvfvnb7v9md2izpjw8r9cwvlx030g5lr";
|
||||
};
|
||||
meta.homepage = "https://github.com/Olical/conjure/";
|
||||
};
|
||||
|
|
@ -2263,24 +2263,24 @@ final: prev:
|
|||
|
||||
coq-artifacts = buildVimPluginFrom2Nix {
|
||||
pname = "coq.artifacts";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.artifacts";
|
||||
rev = "c5f5546a89acc9c423d883199f641db99ba28b5b";
|
||||
sha256 = "0gz9nfq2ssv081hx84c4ydh9ijyx99dh39zw2g4jf6vvz41c1sxs";
|
||||
rev = "963512076adfac6f3010ec33e1ed6be6dbadccce";
|
||||
sha256 = "1g5fymcrnqj32j4z1l85lkpjq9njlqqbir09rpvkdx4x8yfjg0ik";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
||||
};
|
||||
|
||||
coq-thirdparty = buildVimPluginFrom2Nix {
|
||||
pname = "coq.thirdparty";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.thirdparty";
|
||||
rev = "ba47209b2c029dd4b6eb42e267dc7e716b12eb5d";
|
||||
sha256 = "0m4r4k32y5dwg4z6p8xbjrq05vap9kmhrdbifapfdyn1icapna05";
|
||||
rev = "53f3fdee2140c349e036fd5447e9462cf5c42d80";
|
||||
sha256 = "1qj74m853ivjpb5ighy18b53r6vah6vgh4c91vq9wcfgk86xjvfw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
||||
};
|
||||
|
|
@ -2299,12 +2299,12 @@ final: prev:
|
|||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "55ca08083cab18bb5cd1b08f2d5c295b87fce0ef";
|
||||
sha256 = "00kw18965gyxpc1i58fbgpzr10j7yvcd9hwphml8jc07y4xk11w2";
|
||||
rev = "4ab181e67533705b7cbb8b0b109308fce0d954f8";
|
||||
sha256 = "06y4ysmvbyy287wcrmyd97snrmaxaz5zbpmka9dq3x4bc7qd9w47";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
|
@ -2841,24 +2841,24 @@ final: prev:
|
|||
|
||||
dial-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dial.nvim";
|
||||
version = "2023-04-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "monaqa";
|
||||
repo = "dial.nvim";
|
||||
rev = "747d6fd009dbc1904627868125e16cfa7c524b0d";
|
||||
sha256 = "19xn6bjhj6w1c8jaf65f0qrypmpx938dib8ig2md8xxz69hfyc44";
|
||||
rev = "b3916370c24c498117a4c790b2752c437dab661a";
|
||||
sha256 = "141ppws4f4gz90w07hpgs1h93d8v1fsi5kh032kgf65g9bawlri8";
|
||||
};
|
||||
meta.homepage = "https://github.com/monaqa/dial.nvim/";
|
||||
};
|
||||
|
||||
diffview-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "diffview.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindrets";
|
||||
repo = "diffview.nvim";
|
||||
rev = "6780a8a27f5cd326f502653cecef701611641fdf";
|
||||
sha256 = "1qy7mh1j8npqhc6r1zd21g0ihswvgawbc7grc204hhca1g1qzgpx";
|
||||
rev = "0ad3e4f834093412ebbf317b7eaa9c59568824b9";
|
||||
sha256 = "0hhxbs1vdypyacpgrv0b2111ardkgb7akfp86z5d2rwmf3v46qwp";
|
||||
};
|
||||
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
|
||||
};
|
||||
|
|
@ -2901,12 +2901,12 @@ final: prev:
|
|||
|
||||
dracula-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula.nvim";
|
||||
version = "2023-06-02";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mofiqul";
|
||||
repo = "dracula.nvim";
|
||||
rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4";
|
||||
sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl";
|
||||
rev = "5716b1395b32a5865476dd3314bd8888e5f91532";
|
||||
sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n";
|
||||
};
|
||||
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
||||
};
|
||||
|
|
@ -2961,12 +2961,12 @@ final: prev:
|
|||
|
||||
edgy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "edgy.nvim";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "edgy.nvim";
|
||||
rev = "7bf62a057284233381c8fc4848e10d8335942495";
|
||||
sha256 = "0zcvjy6sdqahg7wfyc20zxsdima6zz0hfc4r7zhsw77x5z0jm6cm";
|
||||
rev = "ab09d4f52b53d1db0b576f4b12ff506cdde94f1b";
|
||||
sha256 = "1rzx3qgs4jp6m14jfsx3q43mg9qiva3ph60s933wfdbj5smb1x9i";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/edgy.nvim/";
|
||||
};
|
||||
|
|
@ -2998,12 +2998,12 @@ final: prev:
|
|||
|
||||
elixir-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "elixir-tools.nvim";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-tools";
|
||||
repo = "elixir-tools.nvim";
|
||||
rev = "27c488da1548e62d3e0d09afa1be00f1ba7d73bd";
|
||||
sha256 = "02gln7mzgx7357mvzg4xkvm7wi7k82zj2fj1gd7b5qr3liipr631";
|
||||
rev = "b81fc13648a1944a55a5dddeef4f98632aae24bd";
|
||||
sha256 = "1ld2pcabxla0bakg4hzs5nk8axi86fhs7sc17qyryawdiw1al6pd";
|
||||
};
|
||||
meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
|
||||
};
|
||||
|
|
@ -3324,12 +3324,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74";
|
||||
sha256 = "0jxj57996c4ab54p0zd4h5ldkz9yad1jy0ylzikfq8ylvw7z4p31";
|
||||
rev = "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b";
|
||||
sha256 = "1bdavn7sw4kxyad8667am7vsam4p4aq88ii618sp1xy6r7n5qf4w";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -3432,12 +3432,12 @@ final: prev:
|
|||
|
||||
fzf-lua = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-06-05";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "8d6b6388f40a5c5ddadb32601238944f0b0fc233";
|
||||
sha256 = "1lcj8kq72is82dd49jrnk7gpily2jjjslxfl1rc3q9p9p8zvlknv";
|
||||
rev = "267098387dd7a3c53f8a4cfb17285ba05d841353";
|
||||
sha256 = "1y069942yxzxv7m6l9nrfnpfci0q2rq2m5478sqpgkq9nj6pdycp";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
|
|
@ -3624,12 +3624,12 @@ final: prev:
|
|||
|
||||
glance-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "glance.nvim";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNLHC";
|
||||
repo = "glance.nvim";
|
||||
rev = "6da4999e261829daebbee0c91efb5cb562408755";
|
||||
sha256 = "1s61sc5pz3jhrh5dsq9a8s0ba9mvlpq7i3pkyyicr8ssnjwry1v7";
|
||||
rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1";
|
||||
sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma";
|
||||
};
|
||||
meta.homepage = "https://github.com/DNLHC/glance.nvim/";
|
||||
};
|
||||
|
|
@ -3863,12 +3863,12 @@ final: prev:
|
|||
|
||||
haskell-tools-nvim = buildNeovimPlugin {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "2023-06-05";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "haskell-tools.nvim";
|
||||
rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886";
|
||||
sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip";
|
||||
rev = "5abb0ddb37feb5757509cfe117c9b888e1ea94f5";
|
||||
sha256 = "063nrqmqsd8v5gm8mxcmsaccdx426aa87359vdcfs4afjwxf95mz";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
||||
};
|
||||
|
|
@ -4256,6 +4256,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/twerth/ir_black/";
|
||||
};
|
||||
|
||||
iron-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "iron.nvim";
|
||||
version = "2023-06-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vigemus";
|
||||
repo = "iron.nvim";
|
||||
rev = "9017061849e543d8e94b79d2a94b95e856ab6a10";
|
||||
sha256 = "1yaiywgm4p15c4n6zmp7b4x9ray30vfwn9wvfy1ib97h5vgf55aw";
|
||||
};
|
||||
meta.homepage = "https://github.com/Vigemus/iron.nvim/";
|
||||
};
|
||||
|
||||
is-vim = buildVimPluginFrom2Nix {
|
||||
pname = "is.vim";
|
||||
version = "2020-10-27";
|
||||
|
|
@ -4463,12 +4475,12 @@ final: prev:
|
|||
|
||||
lazy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lazy.nvim";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lazy.nvim";
|
||||
rev = "678179543e0d27650c328d8659f2c2cab4d854ef";
|
||||
sha256 = "01s2c09kw071lvfgn8bfw2aw978n50xdln6aapn4m2iw4fwhsg5s";
|
||||
rev = "10d4371745f88837c78c8daab00c5be6e48abea4";
|
||||
sha256 = "0xnm2lwpvmwg3b87aj5k5lnqld8gywm887mlg84bikkz03spfg91";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lazy.nvim/";
|
||||
};
|
||||
|
|
@ -5039,12 +5051,12 @@ final: prev:
|
|||
|
||||
magma-nvim-goose = buildVimPluginFrom2Nix {
|
||||
pname = "magma-nvim-goose";
|
||||
version = "2023-03-13";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhiteBlackGoose";
|
||||
repo = "magma-nvim-goose";
|
||||
rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
|
||||
sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja";
|
||||
rev = "d7931d773efcedc9c92337b8d500e32a3725fe26";
|
||||
sha256 = "06yfff5yipda1frabria28kby9q1hf485gzij0cgn7s7b035dp4x";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/";
|
||||
};
|
||||
|
|
@ -5087,36 +5099,36 @@ final: prev:
|
|||
|
||||
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mason-lspconfig.nvim";
|
||||
version = "2023-06-05";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason-lspconfig.nvim";
|
||||
rev = "5230617372e656d4a2e1e236e03bf7e7b4b97273";
|
||||
sha256 = "1wfdb1cbqkyh24f3y7hswl2b41s7r2cz0s6ms5az5jfa2a56m1wl";
|
||||
rev = "8f9af9bd7dc8599c8ec5826bb175dc871e4b582d";
|
||||
sha256 = "11pxzmz4j65xzw8ny5nbinbdn9lsx531fa0pzfzfn40b2ilv3cjb";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
|
||||
};
|
||||
|
||||
mason-tool-installer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mason-tool-installer.nvim";
|
||||
version = "2023-03-23";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhoIsSethDaniel";
|
||||
repo = "mason-tool-installer.nvim";
|
||||
rev = "a6c4d7df448a78b0a05fd2065bef11ed52bee51c";
|
||||
sha256 = "187xhyda6jqayg547vl4n5j1jrz5m8h367wnbh66vnhfcrm51rvd";
|
||||
rev = "49e3efe743d846d80da5a4757d4f7e563a96cb84";
|
||||
sha256 = "1g5aha7jjw36wl2ji1i4gwa623x8v6agyxdqv68k7dsbid6kqj3r";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
|
||||
};
|
||||
|
||||
mason-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mason.nvim";
|
||||
version = "2023-05-29";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason.nvim";
|
||||
rev = "7d7efc738e08fc5bee822857db45cb6103f0b0c1";
|
||||
sha256 = "1m8irg61mzw2pcgc9r6nf0v9ch5pgmwq0n1qx8lclwwzxfbwgzdl";
|
||||
rev = "ec8fc11f8ad036c672f6b4a83799d3bcc19b0eb0";
|
||||
sha256 = "06mmbn1l6mcf3hpf4p5n3kv15zp9lla8dzwqzgxpm619p9jv94i5";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason.nvim/";
|
||||
};
|
||||
|
|
@ -5231,24 +5243,24 @@ final: prev:
|
|||
|
||||
mkdx = buildVimPluginFrom2Nix {
|
||||
pname = "mkdx";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SidOfc";
|
||||
repo = "mkdx";
|
||||
rev = "b2c059e15b4998f98faa1d3c9dc6c2cddb2f8208";
|
||||
sha256 = "1flvk7hfdlg95qds8sipqi8zqpi8gzbczybclf0qgyis3r8wc8jl";
|
||||
rev = "518ef7fcbdb3b73b315828622ccd3b026bb3a9c1";
|
||||
sha256 = "0w03jdqfcc3016wxvcm8n890rmgzfkm72fmbd9jy6g8yi2ign0zi";
|
||||
};
|
||||
meta.homepage = "https://github.com/SidOfc/mkdx/";
|
||||
};
|
||||
|
||||
modicator-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "modicator.nvim";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mawkler";
|
||||
repo = "modicator.nvim";
|
||||
rev = "51d7005913f99bf80c207731e052818edf178a3f";
|
||||
sha256 = "0h0fm1j5m470rcf2bkq1dxq4lxirln6ad2giisi3vh9jibgdizbn";
|
||||
rev = "b7a5184c6aac341726de2c0d226e7ad1200687f3";
|
||||
sha256 = "0i9qhq1hcpk60lz9ynd78z0ihccg0gs00h13mbqp0gfp0lq1mhp9";
|
||||
};
|
||||
meta.homepage = "https://github.com/mawkler/modicator.nvim/";
|
||||
};
|
||||
|
|
@ -5267,12 +5279,12 @@ final: prev:
|
|||
|
||||
monokai-pro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "monokai-pro.nvim";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "loctvl842";
|
||||
repo = "monokai-pro.nvim";
|
||||
rev = "9f9d9d253983a9360e16bc1dd2b8d6cea5842006";
|
||||
sha256 = "1riylymbxk5150za0h0jq9w1rs3g67hswgbhfpig89p3m2v49ksv";
|
||||
rev = "5abc7cde23a05ff116f4d64d1d1519f25713dfce";
|
||||
sha256 = "0amhqpi6g8xgqk1qd6jr49nmnagc8kn74m1lwwlqsfbsr7cq4n9h";
|
||||
};
|
||||
meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
|
||||
};
|
||||
|
|
@ -5591,24 +5603,24 @@ final: prev:
|
|||
|
||||
neodev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "d69254e1fbdc4a04c56719dde19e5eafb7b04b58";
|
||||
sha256 = "0l9jfbyhx41ydj5r2jd09gm9j72zzzj1zwjc65d8xda30w3bgl5y";
|
||||
rev = "c120c96225f878e096f124321c14c45aa07968b7";
|
||||
sha256 = "0rh9a6519cjqc1zn5j8l7jz0nsjddn76pa1q913r5h3myrkr10fz";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2023-05-12";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "2d5d071d5957681ae677ee06f6eb879a61b7b618";
|
||||
sha256 = "17rs8k6xzy4c8nkiap84h5n7m0wcam06r6mv2z207di0cck2f4pk";
|
||||
rev = "2adfcbede6cf76e03e600a0e76283d10c4d686fa";
|
||||
sha256 = "1pr8b13bfm3m9gb3as92rf9lcdflk29rax3vgfyihvqp5kr5drcg";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
|
|
@ -5819,12 +5831,12 @@ final: prev:
|
|||
|
||||
neotest-haskell = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-haskell";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "neotest-haskell";
|
||||
rev = "1d11827a3af27a0828279ec65e5a65ae7a30afa5";
|
||||
sha256 = "1r230i39ac6na7b9j3gqs06w89h46dyjw249pj28252n10n6w28f";
|
||||
rev = "5cded2eee7c170933206d7521bb310af25886843";
|
||||
sha256 = "1msf06lszl7fxadyv5ny8hlk5srirkaxlq4bjn0n6xazxyvm1p4b";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
||||
};
|
||||
|
|
@ -6119,12 +6131,12 @@ final: prev:
|
|||
|
||||
nlsp-settings-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nlsp-settings.nvim";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamago324";
|
||||
repo = "nlsp-settings.nvim";
|
||||
rev = "c3480a10179ad17f0241d8c6534e5751d9049c11";
|
||||
sha256 = "1rp7wczxay5hb67gf52cx0wgpgsd6r4bh7q1qz0dh4016crrzxpj";
|
||||
rev = "72a6a37a263d71fbdee8b76a8546e5a2a837c106";
|
||||
sha256 = "0sqa0l7wr35h2n8b024dz4547cxgibn05d2smwc1am9hz8njavpv";
|
||||
};
|
||||
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
|
||||
};
|
||||
|
|
@ -6167,12 +6179,12 @@ final: prev:
|
|||
|
||||
noice-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "noice.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "noice.nvim";
|
||||
rev = "a070cb87a180fd7e2c4387accff0be90268fb736";
|
||||
sha256 = "0838s3vqp2f6g8q7dwd4ga0m4qr8kj02snbrxd6xz4zzzaz1hlbq";
|
||||
rev = "a3318600bc1eba2cca84e879048c1ab8d4a0262d";
|
||||
sha256 = "1hba8idla910jwwpm9dgsa200nb0jw3054rnan7dyawg694d67bv";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/noice.nvim/";
|
||||
};
|
||||
|
|
@ -6215,12 +6227,12 @@ final: prev:
|
|||
|
||||
nui-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nui.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MunifTanjim";
|
||||
repo = "nui.nvim";
|
||||
rev = "64bdc579873fa5bd303f6951ead2b419493c88e8";
|
||||
sha256 = "1hffqk9vz6lw6jrixqy9sxj1wv2z7cbj08ykccyfym2zpij40gx6";
|
||||
rev = "f008972ac7d24f7188521a7f8d158aac2fb0b07e";
|
||||
sha256 = "09icbz63wwl0riv8cy0av1ssjhwgcwla2jpcnra0207h7yx0z0rr";
|
||||
};
|
||||
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
|
||||
};
|
||||
|
|
@ -6251,12 +6263,12 @@ final: prev:
|
|||
|
||||
nvchad = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "nvchad";
|
||||
rev = "27992efc1cee6ac6c0ba002a8df8635464073fa4";
|
||||
sha256 = "01j1zwb6r1zrfjaiy13n2salk9y9k6ivqg8dxjx9j8jqx7xqds2y";
|
||||
rev = "d73d155287ad34c3baf8cdbb89733f45fa80bb2e";
|
||||
sha256 = "0wp6916bm1a8crsikyrgayiqqny1qjm519fk21ih69v5fzq67474";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/nvchad/";
|
||||
};
|
||||
|
|
@ -6371,12 +6383,12 @@ final: prev:
|
|||
|
||||
nvim-cmp = buildNeovimPlugin {
|
||||
pname = "nvim-cmp";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "69e7d280cbe17e318b549a10ae3cae5810946be6";
|
||||
sha256 = "119cfn70bb5bbfaq9rfc51dms64qfzzkn6aknj4lnd2dx1r56k00";
|
||||
rev = "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65";
|
||||
sha256 = "1xh3pzcdbz2hqa3vl14gwn77pqjv939q9jfq1y4ln676jz5ljr4q";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
|
|
@ -6611,12 +6623,12 @@ final: prev:
|
|||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "5ff71ee26591bacdf3387f150759262427d56c13";
|
||||
sha256 = "0nwlfw9ic7jjcaxlghy43scasf846258b75a3v4n71kxvs6w0xkd";
|
||||
rev = "a52da23ca02cfc225c6ecec2b6fa1efbadd609d5";
|
||||
sha256 = "14jgm3i2kiqainqq3w164czybhi1bsanrbvxfpwr31hgigg2pkn6";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
|
@ -6707,12 +6719,12 @@ final: prev:
|
|||
|
||||
nvim-lint = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lint";
|
||||
version = "2023-05-29";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-lint";
|
||||
rev = "58a4fee3d61a6fb3166163c55fe0b2eb29464f9c";
|
||||
sha256 = "1rh5hhgr3lzq144a7bm2wn25fcdd29y1sanw2y5i82ks159ivdk5";
|
||||
rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096";
|
||||
sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||
};
|
||||
|
|
@ -6731,12 +6743,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "08f1f347c718e945c3b1712ebb68c6834182cf3a";
|
||||
sha256 = "0kqxbyb5hg6r4rv79bxjj8dvm3440137xxppp2a5idxi8sisdqad";
|
||||
rev = "fefba589c56a5568a089299e36a4c8242502faaa";
|
||||
sha256 = "128q0l2br61q2gn09ra99g67dp2bfc7czpdpfv2k58dmas0y0wmb";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -6935,12 +6947,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "5508b210504249943a397948b89865728bf314b2";
|
||||
sha256 = "07g4389kjcjp3vi9mcn3jay1zg7w3bv5kxs77619mrrcb8579j57";
|
||||
rev = "cb5e6a7692453624beb122f3d154c266a24d9195";
|
||||
sha256 = "047ra6mqhvlgj6af90sf0jywdvwk9smnr9mdxwc6knwf2cqjmprj";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
|
@ -6983,12 +6995,12 @@ final: prev:
|
|||
|
||||
nvim-spider = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spider";
|
||||
version = "2023-05-25";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisgrieser";
|
||||
repo = "nvim-spider";
|
||||
rev = "ef0c75f9292bcd604418af0a860c86b1c26fdfe7";
|
||||
sha256 = "0xi0mnkajz0phbv5xhpxzgarmbpb6f86qyg09a6m5dnyxjr142r3";
|
||||
rev = "04c6fc14d09823002dae486100745011fc3201ca";
|
||||
sha256 = "14310nzyjw7z83m7lqgbw2g0924ikwqi4h6cg9xcmh9ydflvn4dd";
|
||||
};
|
||||
meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
|
||||
};
|
||||
|
|
@ -7031,36 +7043,36 @@ final: prev:
|
|||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "034511714bacfadc5008e49f73fcef67e5613840";
|
||||
sha256 = "1zgrcbcqxnjnkli235lm9jhds8irxwgh26djfmw1kzz2ry18srsi";
|
||||
rev = "f873625d0636889af4cd47a01e486beb865db205";
|
||||
sha256 = "1744rhzjwwhqvn6wwsm498v4i69wq7hsgqfcym6fq5nga7x3cc0i";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "f9d701176cb9a3e206a4c690920a8993630c3ec8";
|
||||
sha256 = "08zc1irs12clw8fy140j4lk9m4wfjmmmm64dw915gyl0l6r9g0rb";
|
||||
rev = "0ae494269acd469fbd896cf5d5a430dbbf4d4e95";
|
||||
sha256 = "19cf2rrh67amvy5r0ryz3flx2qr7nlqqlq1ypycl519j319raxj2";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
||||
nvim-treesitter-context = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter-context";
|
||||
version = "2023-06-02";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-context";
|
||||
rev = "e2ea37627c0681421ccf4a3cf19d68bb958e1817";
|
||||
sha256 = "01y9h86zvf4rj6zy0hlw59y9ynijj1ljpxhaz5kg689fyhq277cc";
|
||||
rev = "66531e825ab6c790ccf8837cfad2b9fab1b39d0b";
|
||||
sha256 = "15r6jhav1ndsxp9dqs969qw24nqfxihvvw8q5qr3ndd9di668w56";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
|
||||
};
|
||||
|
|
@ -7151,11 +7163,11 @@ final: prev:
|
|||
|
||||
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow2";
|
||||
version = "2023-06-04";
|
||||
version = "2023-06-11";
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
rev = "e1783c843fd0a604d071cb9f0c6919ac93bcd96e";
|
||||
sha256 = "0jh0rjg8swya2647nm5csmmv0b706s2piiiw5ngw8avm77z2f2dc";
|
||||
rev = "60e34278a87b1a9f2ae59a67b4a062c5f6b9b8e7";
|
||||
sha256 = "05a45pw8kv5w71qfcs7zsczyx9ladlz7h03wbbid4xkkm7ibybzl";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
};
|
||||
|
|
@ -7319,12 +7331,12 @@ final: prev:
|
|||
|
||||
onedark-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedark.nvim";
|
||||
version = "2023-06-03";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "navarasu";
|
||||
repo = "onedark.nvim";
|
||||
rev = "8ef51924724d506e515f2d3ac9f959a9eaf38f3d";
|
||||
sha256 = "1716cigy6zni71ipa2yqpqkpqiig92hdzpf9fcrzfmcqwyjddm0s";
|
||||
rev = "462b45758ea94ff30ad48979268094590a6b7b7e";
|
||||
sha256 = "0m7alckgwnqzv9zycrvpisnx8bg2n8057j8lvqjmx4fagfnr8nmh";
|
||||
};
|
||||
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
|
||||
};
|
||||
|
|
@ -7343,12 +7355,12 @@ final: prev:
|
|||
|
||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "266eea8c4dc931c6ef863b8cffcf43b9df88353c";
|
||||
sha256 = "0pargiy0mkwmr695pmj7i191ymlxnsd35sz2r0yga7gnbwjv8hib";
|
||||
rev = "9ae2c7f67aad788bb8217ce1cf978affe0d3d4ef";
|
||||
sha256 = "1d6vqw07gsc3x3xsq6h7m1bwm9ad37bxfp7drjhsrmqz1b8rpc66";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
|
|
@ -7909,12 +7921,12 @@ final: prev:
|
|||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "a85dfff2602b739627b9f8a831de8c3e7b2993ae";
|
||||
sha256 = "1x6i6bwsk4vvbbvgn25vxvbwqy83w1dfkn5fwpnn2lfw88yflchf";
|
||||
rev = "08bcc40638cd4debd5184f934971858e1c5acff4";
|
||||
sha256 = "17isx8rsxzm5lbq9dfh7c0i0lrnqgp1di4vhfajjgam5nnplgp2i";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
|
|
@ -7969,12 +7981,12 @@ final: prev:
|
|||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2023-06-01";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "50a36ff2e7cda1f727cb8607f8e791cebd4fa7b1";
|
||||
sha256 = "06cvmmpb8kn7iffnkhh1c6bzyh8kn4w29ab5gv0bx3hk8qylk55q";
|
||||
rev = "a89e373330649326a80c2fcafe7b92b5814792f6";
|
||||
sha256 = "0qcq33hlbh016x76wpn956wkpc9dy89w2x7gngzr7frx084skjwg";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
|
|
@ -8130,7 +8142,7 @@ final: prev:
|
|||
owner = "VonHeikemen";
|
||||
repo = "searchbox.nvim";
|
||||
rev = "110949af8963185b4e732b45ae57beb731bfcede";
|
||||
sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7";
|
||||
sha256 = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
|
||||
};
|
||||
|
|
@ -8270,12 +8282,12 @@ final: prev:
|
|||
|
||||
smart-splits-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "smart-splits.nvim";
|
||||
version = "2023-05-11";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "smart-splits.nvim";
|
||||
rev = "e9a8f08b9db566ebc2b942b4776567f981b2986c";
|
||||
sha256 = "00snlj1139mx3apdmkb7iimb3dl04711jhdk3q3jx83xp7lg0fgy";
|
||||
rev = "87b0f3374b5c4dd0ff601558a247a2dc78dc7b4e";
|
||||
sha256 = "1svng27iqmly5rwq4jbvx38havzp3pqw70jq587lrg1pylila994";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
|
||||
};
|
||||
|
|
@ -8801,12 +8813,12 @@ final: prev:
|
|||
|
||||
tagalong-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tagalong.vim";
|
||||
version = "2022-05-31";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "tagalong.vim";
|
||||
rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26";
|
||||
sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3";
|
||||
rev = "d12622b866c9eea5204a792517d11586c51715a2";
|
||||
sha256 = "0qys780fh1p7q1my17kq700csg06qfdbn0k210bai9qmd5hhccii";
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/";
|
||||
};
|
||||
|
|
@ -8921,12 +8933,12 @@ final: prev:
|
|||
|
||||
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-file-browser.nvim";
|
||||
version = "2023-06-06";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-file-browser.nvim";
|
||||
rev = "fc70589a93d7bb42f4671ad75c8628a29995bcbe";
|
||||
sha256 = "00advlsr3rbmqrk5cpj8jli29sdi5i2bka2dz0fzsqz5zx3aqvk8";
|
||||
rev = "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803";
|
||||
sha256 = "1w00iklckrsqz9ggimbmbxjzysw596a30j8h249wbkczhym8bphp";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
|
||||
};
|
||||
|
|
@ -9151,12 +9163,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-06-10";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "89ca7265726cb07ca316562b13fd0c406588af65";
|
||||
sha256 = "17684bndaiw8gxi95lydc6xk2gyl5h62wfcmc07l687lpsy6c5l7";
|
||||
rev = "37c526857807e9550bdc8649700d4ceb47750ef2";
|
||||
sha256 = "18xlpim2d5vzf5ls1c0blnal8384cdmk1f2xry22kl4w6qall5mq";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -9572,12 +9584,12 @@ final: prev:
|
|||
|
||||
typst-vim = buildVimPluginFrom2Nix {
|
||||
pname = "typst.vim";
|
||||
version = "2023-05-22";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaarmu";
|
||||
repo = "typst.vim";
|
||||
rev = "6750b01970045affed30efe063d7e21b399f1efc";
|
||||
sha256 = "1zmk96ipzsaqfmm6qzvazg2hwyqgm1sbxxapmw1yk9kvz2jc2q8p";
|
||||
rev = "420d8f815b49d869a9ec57f156440bc85dd38bfd";
|
||||
sha256 = "05lhc8vk1s9sxkrbhx32n175vmgnp2vkarrmzav4pdk67pvh5bb2";
|
||||
};
|
||||
meta.homepage = "https://github.com/kaarmu/typst.vim/";
|
||||
};
|
||||
|
|
@ -14641,12 +14653,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2023-06-08";
|
||||
version = "2023-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "127c0a2ec8c6ca5f4c33902f004d302bd88a7c3e";
|
||||
sha256 = "0pmjazhskmdczj1azdyry8pcaxb9d23ap6imn5dg9z9ymximhk33";
|
||||
rev = "b7690c2d669fcb71d67bcdae5393004dad50948f";
|
||||
sha256 = "1l2xnypl9p2y82hnk9gkf8jhpdc9i591irqvd9b95a1m04d3lm6a";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
@ -15098,12 +15110,12 @@ final: prev:
|
|||
|
||||
chad = buildVimPluginFrom2Nix {
|
||||
pname = "chad";
|
||||
version = "2023-06-09";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "b0c4766b27d9ea2a6b958a247721da8c593f4ff3";
|
||||
sha256 = "0pz2q12bgg8jyyjnhcs2sn68qilm2z8w9h14gryy5klx94mdf8i6";
|
||||
rev = "a184a9cc6de11167c64f449b386dfe0b77a31a91";
|
||||
sha256 = "0862drqfv2qwi2di2kry1fc8xc9zcddyiw0r1lgjy7skjvjlyhid";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -15182,12 +15194,12 @@ final: prev:
|
|||
|
||||
nvchad-extensions = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad-extensions";
|
||||
version = "2023-05-31";
|
||||
version = "2023-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "extensions";
|
||||
rev = "6c01bde163f2c73911df046a2a4883f45a04b611";
|
||||
sha256 = "11zcl9k2mqg58658x68q5msd3fiyw4zn8karpd20vwkk881s28nx";
|
||||
rev = "fda140ca8362f4ec38516701ed94561aa720f2b6";
|
||||
sha256 = "004yqdw1wjbpjk4hib13nky5q1hhcbw5dabccrifjka91av9riwl";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/extensions/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -997,12 +997,12 @@
|
|||
};
|
||||
latex = buildGrammar {
|
||||
language = "latex";
|
||||
version = "0.0.0+rev=dfe8919";
|
||||
version = "0.0.0+rev=2ae2021";
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "tree-sitter-latex";
|
||||
rev = "dfe891922ccd2e7cef52eccb2775e1b576727165";
|
||||
hash = "sha256-xZUrAikgYoSCwFB6vWvV4K5S3sk0RAEUdDhOqLV9PVw=";
|
||||
rev = "2ae2021d7b224fb6aa57b760e0d146059f943bb8";
|
||||
hash = "sha256-790DbJ/nOQvH8WH6MDZZcAKANQTg1fQPGXS4BI2UbmE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
|
||||
};
|
||||
|
|
@ -1509,12 +1509,12 @@
|
|||
};
|
||||
racket = buildGrammar {
|
||||
language = "racket";
|
||||
version = "0.0.0+rev=b726123";
|
||||
version = "0.0.0+rev=0c8791f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "6cdh";
|
||||
repo = "tree-sitter-racket";
|
||||
rev = "b7261231aeaa8157240427716287fb5cbbcf44a2";
|
||||
hash = "sha256-q6/n7vjozuyoKZSupDRTlHX7vCFR5z69sr+PttQUnXI=";
|
||||
rev = "0c8791fdfed9412ea44177f1108da618d8a0470f";
|
||||
hash = "sha256-rpDSlgRtBoQf2iOetyi8meqz0HfddCZalVHxnplR3iE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
|
||||
};
|
||||
|
|
@ -1608,12 +1608,12 @@
|
|||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "0.0.0+rev=d42d40c";
|
||||
version = "0.0.0+rev=199cf06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "d42d40c7adbc638cf9fb571a5bc984715bf083c2";
|
||||
hash = "sha256-fxvAe//NL/yPAmeHH8J3IOATNYzF9DS1NG8kBsfG+1g=";
|
||||
rev = "199cf060eec9e0d427ae3c6fe46de2c830d0c1e9";
|
||||
hash = "sha256-s18lg8/ARxal2k3fSdVAPwso3uxTb5fy1L2LEnRsztY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -357,6 +357,7 @@ https://github.com/parsonsmatt/intero-neovim/,,
|
|||
https://github.com/keith/investigate.vim/,,
|
||||
https://github.com/neutaaaaan/iosvkem/,,
|
||||
https://github.com/twerth/ir_black/,,
|
||||
https://github.com/Vigemus/iron.nvim/,HEAD,
|
||||
https://github.com/haya14busa/is.vim/,,
|
||||
https://github.com/vim-scripts/jdaddy.vim/,,
|
||||
https://github.com/davidhalter/jedi-vim/,,
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
|
|||
in rec {
|
||||
|
||||
stable = fetchurl rec {
|
||||
version = "8.0";
|
||||
version = "8.0.1";
|
||||
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
|
||||
hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4=";
|
||||
hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30=";
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
|
|
@ -56,7 +56,6 @@ in rec {
|
|||
${updateScriptPreamble}
|
||||
major=''${UPDATE_NIX_OLD_VERSION%%.*}
|
||||
latest_stable=$(get_latest_wine_version "$major.0")
|
||||
latest_gecko=$(get_latest_lib_version wine-gecko)
|
||||
|
||||
# Can't use autobump on stable because we don't want the path
|
||||
# <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>.
|
||||
|
|
@ -64,30 +63,41 @@ in rec {
|
|||
set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")"
|
||||
fi
|
||||
|
||||
autobump stable.gecko32 "$latest_gecko"
|
||||
autobump stable.gecko64 "$latest_gecko"
|
||||
|
||||
do_update
|
||||
'');
|
||||
};
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "8.5";
|
||||
version = "8.10";
|
||||
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc=";
|
||||
inherit (stable) gecko32 gecko64 patches;
|
||||
hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
version = "2.47.4";
|
||||
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
|
||||
hash = "sha256-Js7MR3BrCRkI9/gUvdsHTGG+uAYzGOnvxaf3iYV3k9Y=";
|
||||
};
|
||||
gecko64 = fetchurl rec {
|
||||
version = "2.47.4";
|
||||
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
|
||||
hash = "sha256-5ZC32YijLWqkzx2Ko6o9M3Zv3Uz0yJwtzCCV7LKNBm8=";
|
||||
};
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "7.4.0";
|
||||
version = "8.0.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
|
||||
hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs=";
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-wine-unstable" ''
|
||||
${updateScriptPreamble}
|
||||
major=''${UPDATE_NIX_OLD_VERSION%%.*}
|
||||
latest_unstable=$(get_latest_wine_version "$major.x")
|
||||
latest_gecko=$(get_latest_lib_version wine-gecko)
|
||||
latest_mono=$(get_latest_lib_version wine-mono)
|
||||
|
||||
update_staging() {
|
||||
|
|
@ -96,6 +106,8 @@ in rec {
|
|||
}
|
||||
|
||||
autobump unstable "$latest_unstable" "" update_staging
|
||||
autobump unstable.gecko32 "$latest_gecko"
|
||||
autobump unstable.gecko64 "$latest_gecko"
|
||||
autobump unstable.mono "$latest_mono"
|
||||
|
||||
do_update
|
||||
|
|
@ -105,7 +117,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-vHV7x2U9B4P0E4tcQuMXHSS4NqN7rlnhC6v/t+0Qlh0=";
|
||||
hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ buildGoModule rec {
|
|||
homepage = "https://godoc.org/github.com/gokcehan/lf";
|
||||
changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
|
||||
{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
|
||||
|
||||
# For `digitaglinktree`
|
||||
, perl, sqlite
|
||||
|
|
@ -52,6 +52,9 @@
|
|||
|
||||
, breeze-icons
|
||||
, oxygen
|
||||
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
, cudaPackages ? {}
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -63,7 +66,15 @@ mkDerivation rec {
|
|||
sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
wrapGAppsHook
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
cuda_nvcc
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
bison
|
||||
|
|
@ -109,7 +120,9 @@ mkDerivation rec {
|
|||
marble
|
||||
oxygen
|
||||
threadweaver
|
||||
];
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
cuda_cudart
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_MYSQLSUPPORT=1"
|
||||
|
|
|
|||
|
|
@ -14,19 +14,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "21.2.8";
|
||||
version = "21.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-XXtAd29r161rcamZM8QnkJ9mhQeJvqTL4Escdu95me8=";
|
||||
hash = "sha256-f8QQA8qehB7wYJRoKizPxewBTVV64kxaBg2oTTNelBU=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-H77BfiH3Nqi1a2Uek8N8BgODzMBGgXrBvrcahrKisNo=";
|
||||
hash = "sha256-gLt6a2Kq1LIzFiSnqLKKFTg8sd3Wrqsdys23SCFcrQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/applications/graphics/upscayl/default.nix
Normal file
42
pkgs/applications/graphics/upscayl/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
lib,
|
||||
}: let
|
||||
pname = "upscayl";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
|
||||
hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
|
||||
cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
|
||||
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free and Open Source AI Image Upscaler";
|
||||
homepage = "https://upscayl.github.io/";
|
||||
maintainers = with maintainers; [icy-thought];
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
, kiconthemes
|
||||
, kio
|
||||
, kirigami2
|
||||
, kirigami-addons
|
||||
, knotifications
|
||||
, kpeople
|
||||
, kpeoplevcard
|
||||
|
|
@ -43,6 +44,7 @@ mkDerivation {
|
|||
kiconthemes
|
||||
kio
|
||||
kirigami2
|
||||
kirigami-addons
|
||||
knotifications
|
||||
kpeople
|
||||
kpeoplevcard
|
||||
|
|
@ -76,5 +78,6 @@ mkDerivation {
|
|||
homepage = "https://community.kde.org/KDEConnect";
|
||||
license = with licenses; [ gpl2 ];
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
mainProgram = "kdeconnect-app";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,5 @@ buildGoModule rec {
|
|||
license = licenses.osl3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
mainProgram = "AutoSpotting";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.20.0";
|
||||
version = "6.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-1X7folCrXzNwSCWnepD9MFW9Ujx+PwoK0ih+zgEtA7o=";
|
||||
hash = "sha256-gGgXnJbGbp6uK9tFK6wqHBKf+zWidF5u5wI2lclrJGk=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/TomWright/dasel";
|
||||
changelog = "https://github.com/TomWright/dasel/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.24.0";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-2J5SVEtlLhZhDzqakOh/gt8XTkSaM9KBa0zCYM4UZAQ=";
|
||||
sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "13.3";
|
||||
version = "13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
hash = "sha256-eJ5jW81GQr/MvOrxinZdalZ4cvGYlVGv7JbePwHGEDY=";
|
||||
hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ buildGoModule rec {
|
|||
description = "CLI for the Mastodon social network API";
|
||||
homepage = "https://github.com/McKael/madonctl";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,5 @@ buildGoModule rec {
|
|||
homepage = "https://sampler.dev";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ uvnikita ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "timewarrior";
|
||||
|
|
@ -12,10 +12,15 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake asciidoctor ];
|
||||
nativeBuildInputs = [ cmake asciidoctor installShellFiles ];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd timew \
|
||||
--bash completion/timew-completion.bash
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line time tracker";
|
||||
homepage = "https://timewarrior.net";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/sachaos/todoist";
|
||||
description = "Todoist CLI Client";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/RasmusLindroth/tut";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ equirosa ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "adguardian";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lissy93";
|
||||
repo = "AdGuardian-Term";
|
||||
rev = version;
|
||||
hash = "sha256-r7dh31fZgcUBffzwoBqIoV9XhZOjJRb9aWZUuuiz7y8=";
|
||||
hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/fBLLqmKsoV9Kdsj6JFQwdkidc1TgYfvJP0Wx1po1ao=";
|
||||
cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "113.0.2-1",
|
||||
"packageVersion": "114.0.1-2",
|
||||
"source": {
|
||||
"rev": "113.0.2-1",
|
||||
"sha256": "0wbs6bgcjrxjnh0wk6qz329zy0dlma0wdwb3law877y9dphilh47"
|
||||
"rev": "114.0.1-2",
|
||||
"sha256": "1di8kfzc27wz89cfq8xgs17lyayikpmqwn5npdzllzppp0dx0894"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "113.0.2",
|
||||
"sha512": "7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743"
|
||||
"version": "114.0.1",
|
||||
"sha512": "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yandex-browser";
|
||||
version = "23.3.1.906-1";
|
||||
version = "23.5.1.754-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
|
||||
sha256 = "sha256-hQwAHtPUcGSDKD7SmWa8H1f/T4Imu9061tIvenw0KWQ=";
|
||||
sha256 = "sha256-ngtwrq8vDEt39Zd5jpBadouN1V8ly03la69M0AUyhGM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -136,12 +136,5 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ dan4ik605743 ionutnechita ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
knownVulnerabilities = [
|
||||
''
|
||||
Trusts a Russian government issued CA certificate for some websites.
|
||||
See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,5 @@ buildGoModule rec {
|
|||
homepage = "https://helmfile.readthedocs.io/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/Praqma/helmsman";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lynty ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/xetys/hetzner-kube";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ eliasp ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,5 @@ buildGoModule rec {
|
|||
homepage = "https://istio.io/latest/docs/reference/commands/istioctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bryanasdev000 veehaitch ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SPHayFfYFpg1AOoe003xh7NGQLpvhd1C2k4IilgMqSw=";
|
||||
hash = "sha256-p/mGobQyn5e7TpqjarVT7qBgYDWtX1VgXq814O8mTmI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -47,7 +47,7 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/GoogleContainerTools/kaniko";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jk ];
|
||||
maintainers = with lib.maintainers; [ jk qjoly ];
|
||||
mainProgram = "executor";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,5 @@ buildGoModule rec {
|
|||
homepage = "https://kompose.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thpham vdemeester ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ let
|
|||
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} // attrs';
|
||||
in
|
||||
|
|
|
|||
|
|
@ -37,6 +37,5 @@ buildGoModule rec {
|
|||
changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.0.8";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubefirst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JGseXRUehRuH1kuTfmkAJcfRN3vM0zN7K8pnOfJ0LAs=";
|
||||
hash = "sha256-t5tbgLXpJX2yWUdEW7zKb4A7B7budAOitOkL5I2CWpk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sc6HXJXkZ9vW6sxEKCTo6LDHeOGLTz0oN9JH11iUA/k=";
|
||||
vendorHash = "sha256-D2Gi90seLPTM0ttlz7V6FW1ZMiVN22YLWKeTquXvagY=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/pulumi/kubespy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ blaggacao ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/hashicorp/levant";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ max-niederman ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,5 @@ buildGoModule rec {
|
|||
description = "A tool that makes it easy to run Kubernetes locally";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang Chili-Man ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ let
|
|||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,6 +34,5 @@ buildGoModule rec {
|
|||
homepage = "https://odo.dev";
|
||||
changelog = "https://github.com/redhat-developer/odo/releases/v${version}";
|
||||
maintainers = with maintainers; [ stehessel ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I=";
|
||||
hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";
|
||||
|
|
|
|||
|
|
@ -34,6 +34,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/stern/stern";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mbode preisschild ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,5 @@ buildGoModule rec {
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mikefaille ];
|
||||
mainProgram = "tk";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,11 +209,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-1INYBqZcv7IRqhbt5Q/aZ2MYMwH7A0h1UzF4KZ9AK3U=",
|
||||
"hash": "sha256-35pcXFmVCO2naCeDDcNtgzUeMdkGfGBxZvYSSGtH824=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.26.2",
|
||||
"rev": "v1.27.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
|
||||
},
|
||||
|
|
@ -437,24 +437,24 @@
|
|||
"vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-emfKbO9RGX+DiBik3Hz84IqZGrCV8JBAPt2fHAu8yxc=",
|
||||
"hash": "sha256-ShfbbVo53EughhmflIJgiLkW2J6VJHqUJ4tgoCIcJ0w=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.68.0",
|
||||
"rev": "v4.69.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
|
||||
"vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-yhaEGLdRzfSaWfdqKdeRYHj0neaBZ4WS+o8wB+Vsb7g=",
|
||||
"hash": "sha256-QvW1BRZn0d0uzPw385w7FTrlVkRIQ0Qz3ImlF7L+sE4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.68.0",
|
||||
"rev": "v4.69.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
|
||||
"vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
|
@ -692,13 +692,13 @@
|
|||
"vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
|
||||
"hash": "sha256-qJp/RekJBsXx5Ic6J6CKs/oBcyqHB/sSjpzjAZUf2iE=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
|
||||
"owner": "terraform-lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.9.1",
|
||||
"rev": "v1.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc="
|
||||
"vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw="
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",
|
||||
|
|
@ -764,11 +764,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-Qm5rMgJ4SN3gmhoMaDDcXg75r7mYHavQzoiscsUk6Vk=",
|
||||
"hash": "sha256-gjqU2DCHpM65ASF8dW/X/00m1vYY0MVlz/cW6LXQVig=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.24.1",
|
||||
"rev": "v3.24.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8="
|
||||
},
|
||||
|
|
@ -819,13 +819,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-NUczAdOYpqpHGpE2OaJtziggA5o+CUYSq2F/RkTL7YU=",
|
||||
"hash": "sha256-vjTv27oRFQ4sMON4v0BOajAkZwawpNBJchnrPa1ienA=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v4.0.0",
|
||||
"rev": "v4.0.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LjYPZaF8vy1WUNeI/TFIDjVh08sxf6nKLpvmQsCQFFo="
|
||||
"vendorHash": "sha256-Sws5X2Vsyn0qJr8zfK8Ti1q2nSVyvU4PtsFimJE32VQ="
|
||||
},
|
||||
"oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
|
|
@ -864,11 +864,11 @@
|
|||
"vendorHash": "sha256-ubEoh4GUkyNAvyHCowURhvucOyFpMidxoFeqE1w2GQY="
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-fcQChRIwxAeAdYPTYC9rPSdbrmXaBIOotF7vQhO9Sl0=",
|
||||
"hash": "sha256-us4UaCLvWWoS+N7eXPs2/xSk9wl1zULaiG93LX45bks=",
|
||||
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
|
||||
"owner": "opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.23",
|
||||
"rev": "v0.6.24",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -30,6 +30,5 @@ buildGoModule rec {
|
|||
description = "Google Drive client for the commandline";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/prasmussen/gdrive";
|
||||
description = "A command line utility for interacting with Google Drive";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.rzetterberg ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/emersion/hydroxide";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,5 @@ buildGoModule rec {
|
|||
description = "Discord terminal client";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,5 @@ buildGoModule rec {
|
|||
description = "A terminal based Matrix client written in Go";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ chvp emily ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue