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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Theodore Ni 2023-08-18 16:02:27 -07:00
commit ece0953571
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
480 changed files with 24071 additions and 26584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -294,8 +294,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/nixos/tests/matrix-conduit.nix @piegamesde
# Dotnet
/pkgs/build-support/dotnet @IvarWithoutBones
/pkgs/development/compilers/dotnet @IvarWithoutBones
/pkgs/build-support/dotnet @IvarWithoutBones
/pkgs/development/compilers/dotnet @IvarWithoutBones
/pkgs/test/dotnet @IvarWithoutBones
/doc/languages-frameworks/dotnet.section.md @IvarWithoutBones
# Node.js
/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt

4
.github/labeler.yml vendored
View File

@ -188,6 +188,10 @@
- nixos/tests/xfce.nix
- pkgs/desktops/xfce/**/*
"6.topic: zig":
- pkgs/development/compilers/zig/**/*
- doc/hooks/zig.section.md
"8.has: changelog":
- nixos/doc/manual/release-notes/**/*

2
doc/languages-frameworks/dotnet.section.md
View File

@ -210,3 +210,5 @@ buildDotnetGlobalTool {
};
}
```
When packaging a new .NET application in nixpkgs, you can tag the [`@NixOS/dotnet`](https://github.com/orgs/nixos/teams/dotnet) team for help and code review.

1218
doc/languages-frameworks/python.section.md
View File

File diff suppressed because it is too large Load Diff

6
lib/modules.nix
View File

@ -633,7 +633,7 @@ let
optionDecls = filter
(m: m.options?_type
&& (m.options._type == "option"
|| throwDeclarationTypeError loc m.options._type
|| throwDeclarationTypeError loc m.options._type m._file
)
)
decls;
@ -698,14 +698,14 @@ let
) unmatchedDefnsByName);
};
throwDeclarationTypeError = loc: actualTag:
throwDeclarationTypeError = loc: actualTag: file:
let
name = lib.strings.escapeNixIdentifier (lib.lists.last loc);
path = showOption loc;
depth = length loc;
paragraphs = [
"Expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
"In module ${file}: expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
] ++ optional (actualTag == "option-type") ''
When declaring an option, you must wrap the type in a `mkOption` call. It should look somewhat like:
${comment}

2
lib/systems/parse.nix
View File

@ -221,6 +221,8 @@ rec {
vendors = setTypes types.openVendor {
apple = {};
pc = {};
knuth = {};
# Actually matters, unlocking some MinGW-w64-specific options in GCC. See
# bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/
w64 = {};

6
lib/tests/modules.sh
View File

@ -394,9 +394,9 @@ checkConfigError \
./declare-set.nix ./declare-enable-nested.nix
# Options: accidental use of an option-type instead of option (or other tagged type; unlikely)
checkConfigError 'Expected an option declaration at option path .result. but got an attribute set with type option-type' config.result ./options-type-error-typical.nix
checkConfigError 'Expected an option declaration at option path .result.here. but got an attribute set with type option-type' config.result.here ./options-type-error-typical-nested.nix
checkConfigError 'Expected an option declaration at option path .result. but got an attribute set with type configuration' config.result ./options-type-error-configuration.nix
checkConfigError 'In module .*/options-type-error-typical.nix: expected an option declaration at option path .result. but got an attribute set with type option-type' config.result ./options-type-error-typical.nix
checkConfigError 'In module .*/options-type-error-typical-nested.nix: expected an option declaration at option path .result.here. but got an attribute set with type option-type' config.result.here ./options-type-error-typical-nested.nix
checkConfigError 'In module .*/options-type-error-configuration.nix: expected an option declaration at option path .result. but got an attribute set with type configuration' config.result ./options-type-error-configuration.nix
# Check that that merging of option collisions doesn't depend on type being set
checkConfigError 'The option .group..*would be a parent of the following options, but its type .<no description>. does not support nested options.\n\s*- option.s. with prefix .group.enable..*' config.group.enable ./merge-typeless-option.nix

70
maintainers/maintainer-list.nix
View File

@ -1466,6 +1466,15 @@
githubId = 1482768;
name = "Benjamin Asbach";
};
asciimoth = {
name = "Andrew";
email = "ascii@moth.contact";
github = "asciimoth";
githubId = 91414737;
keys = [{
fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F";
}];
};
ashalkhakov = {
email = "artyom.shalkhakov@gmail.com";
github = "ashalkhakov";
@ -3768,6 +3777,12 @@
githubId = 1298344;
name = "Daniel Fullmer";
};
danielrolls = {
email = "daniel.rolls.27@googlemail.com";
github = "danielrolls";
githubId = 50051176;
name = "Daniel Rolls";
};
daniyalsuri6 = {
email = "daniyal.suri@gmail.com";
github = "daniyalsuri6";
@ -6236,6 +6251,12 @@
githubId = 471835;
name = "Giorgio Gallo";
};
GirardR1006 = {
email = "julien.girard2@cea.fr";
github = "GirardR1006";
githubId = 19275558;
name = "Julien Girard-Satabin";
};
GKasparov = {
email = "mizozahr@gmail.com";
github = "GKasparov";
@ -7468,6 +7489,12 @@
githubId = 20320695;
name = "Matan Bendix Shenhav";
};
iynaix = {
email = "iynaix@gmail.com";
github = "iynaix";
githubId = 94313;
name = "Xianyi Lin";
};
izorkin = {
email = "Izorkin@gmail.com";
github = "Izorkin";
@ -7504,6 +7531,12 @@
github = "j4m3s-s";
githubId = 9413812;
};
jacbart = {
name = "Jack Bartlett";
email = "jacbart@gmail.com";
github = "jacbart";
githubId = 7909687;
};
jacfal = {
name = "Jakub Pravda";
email = "me@jakubpravda.net";
@ -7522,6 +7555,12 @@
githubId = 7558482;
name = "Jack Gerrits";
};
jaduff = {
email = "jdduffpublic@proton.me";
github = "jaduff";
githubId = 10690970;
name = "James Duff";
};
jagajaga = {
email = "ars.seroka@gmail.com";
github = "jagajaga";
@ -8724,6 +8763,12 @@
githubId = 1927188;
name = "karolchmist";
};
kashw2 = {
email = "supra4keanu@hotmail.com";
github = "kashw2";
githubId = 15855440;
name = "Keanu Ashwell";
};
katexochen = {
github = "katexochen";
githubId = 49727155;
@ -13923,6 +13968,12 @@
githubId = 115877;
name = "Kenny Shen";
};
quadradical = {
email = "nixos@henryhiles.com";
github = "Henry-Hiles";
githubId = 71790868;
name = "Henry Hiles";
};
quag = {
email = "quaggy@gmail.com";
github = "quag";
@ -15910,6 +15961,12 @@
githubId = 2600039;
name = "Spencer Janssen";
};
spikespaz = {
name = "Jacob Birkett";
email = "support@birkett.dev";
github = "spikespaz";
githubId = 12502988;
};
spinus = {
email = "tomasz.czyz@gmail.com";
github = "spinus";
@ -16541,6 +16598,12 @@
githubId = 863327;
name = "Tyler Benster";
};
tbidne = {
email = "tbidne@protonmail.com";
github = "tbidne";
githubId = 2856188;
name = "Thomas Bidne";
};
tboerger = {
email = "thomas@webhippie.de";
matrix = "@tboerger:matrix.org";
@ -17044,6 +17107,13 @@
githubId = 1292007;
name = "Sébastien Maccagnoni";
};
tiredofit = {
email = "dave@tiredofit.ca";
github = "tiredofit";
githubId = 23528985;
name = "Dave Conroy";
matrix = "@dave:tiredofit.ca";
};
tirex = {
email = "szymon@kliniewski.pl";
name = "Szymon Kliniewski";

1
maintainers/scripts/haskell/update-stackage.sh
View File

@ -66,6 +66,7 @@ sed -r \
-e '/ hie-bios /d' \
-e '/ ShellCheck /d' \
-e '/ Agda /d' \
-e '/ stack /d' \
< "${tmpfile_new}" >> $stackage_config
# Explanations:
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

13
maintainers/team-list.nix
View File

@ -181,6 +181,19 @@ with lib.maintainers; {
shortName = "Cosmopolitan";
};
dotnet = {
members = [
ivar
mdarocha
corngood
raphaelr
jamiemagee
anpin
];
scope = "Maintainers of the .NET build tools and packages";
shortName = "dotnet";
};
deepin = {
members = [
rewine

91
nixos/doc/manual/contributing-to-this-manual.chapter.md
View File

@ -7,6 +7,7 @@ You can quickly check your edits with the following:
```ShellSession
$ cd /path/to/nixpkgs
$ $EDITOR doc/nixos/manual/... # edit the manual
$ nix-build nixos/release.nix -A manual.x86_64-linux
```
@ -14,24 +15,96 @@ If the build succeeds, the manual will be in `./result/share/doc/nixos/index.htm
There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-devmode).
**Contributing to the man pages**
The above instructions don't deal with the appendix of available `configuration.nix` options, and the manual pages related to NixOS. These are built, and written in a different location and in a different format, as explained in the next sections.
The man pages are written in [DocBook] which is XML.
## Contributing to the `configuration.nix` options documentation {#sec-contributing-options}
To see what your edits look like:
The documentation for all the different `configuration.nix` options is automatically generated by reading the `description`s of all the NixOS options defined at `nixos/modules/`. If you want to improve such `description`, find it in the `nixos/modules/` directory, and edit it and open a pull request.
To see how your changes render on the web, run again:
```ShellSession
$ nix-build nixos/release.nix -A manual.x86_64-linux
```
And you'll see the changes to the appendix in the path `result/share/doc/nixos/options.html`.
You can also build only the `configuration.nix(5)` manual page, via:
```ShellSession
$ cd /path/to/nixpkgs
$ nix-build nixos/release.nix -A manpages.x86_64-linux
$ nix-build nixos/release.nix -A nixos-configuration-reference-manpage.x86_64-linux
```
You can then read the man page you edited by running
And observe the result via:
```ShellSession
$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited
$ man --local-file result/share/man/man5/configuration.nix.5
```
If you're on a different architecture that's supported by NixOS (check nixos/release.nix) then replace `x86_64-linux` with the architecture.
`nix-build` will complain otherwise, but should also tell you which architecture you have + the supported ones.
If you're on a different architecture that's supported by NixOS (check file `nixos/release.nix` on Nixpkgs' repository) then replace `x86_64-linux` with the architecture. `nix-build` will complain otherwise, but should also tell you which architecture you have + the supported ones.
[DocBook]: https://en.wikipedia.org/wiki/DocBook
## Contributing to `nixos-*` tools' manpages {#sec-contributing-nixos-tools}
The manual pages for the tools available in the installation image can be found in Nixpkgs by running (e.g for `nixos-rebuild`):
```ShellSession
$ git ls | grep nixos-rebuild.8
```
Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (except for minor differences, notably different spacing rules.)
For a preview, run `man --local-file path/to/file.8`.
Being written in `mdoc`, these manpages use semantic markup. This following subsections provides a guideline on where to apply which semantic elements.
### Command lines and arguments {#ssec-contributing-nixos-tools-cli-and-args}
In any manpage, commands, flags and arguments to the *current* executable should be marked according to their semantics. Commands, flags and arguments passed to *other* executables should not be marked like this and should instead be considered as code examples and marked with `Ql`.
- Use `Fl` to mark flag arguments, `Ar` for their arguments.
- Repeating arguments should be marked by adding an ellipsis (spelled with periods, `...`).
- Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`.
- Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments.
- Required flags or arguments should not be marked.
- Mutually exclusive groups of arguments should be enclosed in curly brackets, preferably created with `Bro`/`Brc` blocks.
When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` option that calls ssh to retrieve the host's local time would signify this thusly:
```
This will run
.Ic ssh Ar name Ic time
to retrieve the remote time.
```
### Paths, NixOS options, environment variables {#ssec-contributing-nixos-tools-options-and-environment}
Constant paths should be marked with `Pa`, NixOS options with `Va`, and environment variables with `Ev`.
Generated paths, e.g. `result/bin/run-hostname-vm` (where `hostname` is a variable or arguments) should be marked as `Ql` inline literals with their variable components marked appropriately.
- When `hostname` refers to an argument, it becomes `.Ql result/bin/run- Ns Ar hostname Ns -vm`
- When `hostname` refers to a variable, it becomes `.Ql result/bin/run- Ns Va hostname Ns -vm`
### Code examples and other commands {#ssec-contributing-nixos-tools-code-examples}
In free text names and complete invocations of other commands (e.g. `ssh` or `tar -xvf src.tar`) should be marked with `Ic`, fragments of command lines should be marked with `Ql`.
Larger code blocks or those that cannot be shown inline should use indented literal display block markup for their contents, i.e.
```
.Bd -literal -offset indent
...
.Ed
```
Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be substituted into them:
```
.Bd -literal -offset indent
{
config.networking.hostname = "\c
.Ar hostname Ns \c
";
}
.Ed
```

6
nixos/doc/manual/default.nix
View File

@ -184,8 +184,8 @@ in rec {
'';
# Generate the NixOS manpages.
manpages = runCommand "nixos-manpages"
# Generate the `man configuration.nix` package
nixos-configuration-reference-manpage = runCommand "nixos-configuration-reference-manpage"
{ nativeBuildInputs = [
buildPackages.installShellFiles
buildPackages.nixos-render-docs
@ -194,8 +194,6 @@ in rec {
}
''
# Generate manpages.
mkdir -p $out/share/man/man8
installManPage ${./manpages}/*
mkdir -p $out/share/man/man5
nixos-render-docs -j $NIX_BUILD_CORES options manpage \
--revision ${lib.escapeShellArg revision} \

57
nixos/doc/manual/manpages/README.md
View File

@ -1,57 +0,0 @@
# NixOS manpages
This is the collection of NixOS manpages, excluding `configuration.nix(5)`.
Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (though minor differences may occur, mandoc and groff seem to have slightly different spacing rules.)
For previewing edited files, you can just run `man -l path/to/file.8` and you will see it rendered.
Being written in `mdoc` these manpages use semantic markup. This file provides a guideline on where to apply which of the semantic elements of `mdoc`.
### Command lines and arguments
In any manpage, commands, flags and arguments to the *current* executable should be marked according to their semantics. Commands, flags and arguments passed to *other* executables should not be marked like this and should instead be considered as code examples and marked with `Ql`.
- Use `Fl` to mark flag arguments, `Ar` for their arguments.
- Repeating arguments should be marked by adding ellipses (`...`).
- Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`.
- Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments.
- Required flags or arguments should not be marked.
- Mutually exclusive groups of arguments should be enclosed in curly brackets, preferably created with `Bro`/`Brc` blocks.
When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly:
```
This will run
.Ic ssh Ar name Ic time
to retrieve the remote time.
```
### Paths, NixOS options, environment variables
Constant paths should be marked with `Pa`, NixOS options with `Va`, and environment variables with `Ev`.
Generated paths, e.g. `result/bin/run-hostname-vm` (where `hostname` is a variable or arguments) should be marked as `Ql` inline literals with their variable components marked appropriately.
- Taking `hostname` from an argument become `.Ql result/bin/run- Ns Ar hostname Ns -vm`
- Taking `hostname` from a variable otherwise defined becomes `.Ql result/bin/run- Ns Va hostname Ns -vm`
### Code examples and other commands
In free text names and complete invocations of other commands (e.g. `ssh` or `tar -xvf src.tar`) should be marked with `Ic`, fragments of command lines should be marked with `Ql`.
Larger code blocks or those that cannot be shown inline should use indented literal display block markup for their contents, i.e.
```
.Bd -literal -offset indent
...
.Ed
```
Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be substituted into them:
```
.Bd -literal -offset indent
{
options.hostname = "\c
.Ar hostname Ns \c
";
}
.Ed
```

8
nixos/lib/test-driver/test_driver/__init__.py
View File

@ -106,7 +106,13 @@ def main() -> None:
args.keep_vm_state,
) as driver:
if args.interactive:
ptpython.repl.embed(driver.test_symbols(), {})
history_dir = os.getcwd()
history_path = os.path.join(history_dir, ".nixos-test-history")
ptpython.repl.embed(
driver.test_symbols(),
{},
history_filename=history_path,
)
else:
tic = time.time()
driver.run_tests()

0
nixos/doc/manual/manpages/nixos-build-vms.8 → nixos/modules/installer/tools/manpages/nixos-build-vms.8
View File

0
nixos/doc/manual/manpages/nixos-enter.8 → nixos/modules/installer/tools/manpages/nixos-enter.8
View File

0
nixos/doc/manual/manpages/nixos-generate-config.8 → nixos/modules/installer/tools/manpages/nixos-generate-config.8
View File

0
nixos/doc/manual/manpages/nixos-install.8 → nixos/modules/installer/tools/manpages/nixos-install.8
View File

0
nixos/doc/manual/manpages/nixos-version.8 → nixos/modules/installer/tools/manpages/nixos-version.8
View File

11
nixos/modules/installer/tools/tools.nix
View File

@ -9,12 +9,19 @@ let
makeProg = args: pkgs.substituteAll (args // {
dir = "bin";
isExecutable = true;
nativeBuildInputs = [
pkgs.installShellFiles
];
postInstall = ''
installManPage ${args.manPage}
'';
});
nixos-build-vms = makeProg {
name = "nixos-build-vms";
src = ./nixos-build-vms/nixos-build-vms.sh;
inherit (pkgs) runtimeShell;
manPage = ./manpages/nixos-build-vms.8;
};
nixos-install = makeProg {
@ -27,6 +34,7 @@ let
nixos-enter
pkgs.util-linuxMinimal
];
manPage = ./manpages/nixos-install.8;
};
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
@ -40,6 +48,7 @@ let
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
xserverEnabled = config.services.xserver.enable;
manPage = ./manpages/nixos-generate-config.8;
};
inherit (pkgs) nixos-option;
@ -57,6 +66,7 @@ let
} // optionalAttrs (config.system.configurationRevision != null) {
configurationRevision = config.system.configurationRevision;
});
manPage = ./manpages/nixos-version.8;
};
nixos-enter = makeProg {
@ -66,6 +76,7 @@ let
path = makeBinPath [
pkgs.util-linuxMinimal
];
manPage = ./manpages/nixos-enter.8;
};
in

2
nixos/modules/misc/documentation.nix
View File

@ -346,7 +346,7 @@ in
system.build.manual = manual;
environment.systemPackages = []
++ optional cfg.man.enable manual.manpages
++ optional cfg.man.enable manual.nixos-configuration-reference-manpage
++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ];
})

7
nixos/modules/programs/environment.nix
View File

@ -51,13 +51,6 @@ in
environment.extraInit =
''
unset ASPELL_CONF
for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do
if [ -d "$i/lib/aspell" ]; then
export ASPELL_CONF="dict-dir $i/lib/aspell"
fi
done
export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER"
export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}"
'';

124
nixos/modules/services/databases/influxdb2.nix
View File

@ -1,8 +1,17 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit
(lib)
escapeShellArg
hasAttr
literalExpression
mkEnableOption
mkIf
mkOption
types
;
format = pkgs.formats.json { };
cfg = config.services.influxdb2;
configFile = format.generate "config.json" cfg.settings;
@ -24,14 +33,60 @@ in
description = lib.mdDoc ''configuration options for influxdb2, see <https://docs.influxdata.com/influxdb/v2.0/reference/config-options> for details.'';
type = format.type;
};
provision = {
enable = mkEnableOption "initial database setup and provisioning";
initialSetup = {
organization = mkOption {
type = types.str;
example = "main";
description = "Primary organization name";
};
bucket = mkOption {
type = types.str;
example = "example";
description = "Primary bucket name";
};
username = mkOption {
type = types.str;
default = "admin";
description = "Primary username";
};
retention = mkOption {
type = types.str;
default = "0";
description = ''
The duration for which the bucket will retain data (0 is infinite).
Accepted units are `ns` (nanoseconds), `us` or `µs` (microseconds), `ms` (milliseconds),
`s` (seconds), `m` (minutes), `h` (hours), `d` (days) and `w` (weeks).
'';
};
passwordFile = mkOption {
type = types.path;
description = "Password for primary user. Don't use a file from the nix store!";
};
tokenFile = mkOption {
type = types.path;
description = "API Token to set for the admin user. Don't use a file from the nix store!";
};
};
};
};
};
config = mkIf cfg.enable {
assertions = [{
assertion = !(builtins.hasAttr "bolt-path" cfg.settings) && !(builtins.hasAttr "engine-path" cfg.settings);
message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd";
}];
assertions = [
{
assertion = !(hasAttr "bolt-path" cfg.settings) && !(hasAttr "engine-path" cfg.settings);
message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd";
}
];
systemd.services.influxdb2 = {
description = "InfluxDB is an open-source, distributed, time series database";
@ -52,7 +107,62 @@ in
LimitNOFILE = 65536;
KillMode = "control-group";
Restart = "on-failure";
LoadCredential = mkIf cfg.provision.enable [
"admin-password:${cfg.provision.initialSetup.passwordFile}"
"admin-token:${cfg.provision.initialSetup.tokenFile}"
];
};
path = [pkgs.influxdb2-cli];
# Mark if this is the first startup so postStart can do the initial setup
preStart = mkIf cfg.provision.enable ''
if ! test -e "$STATE_DIRECTORY/influxd.bolt"; then
touch "$STATE_DIRECTORY/.first_startup"
fi
'';
postStart = let
initCfg = cfg.provision.initialSetup;
in mkIf cfg.provision.enable (
''
set -euo pipefail
export INFLUX_HOST="http://"${escapeShellArg (cfg.settings.http-bind-address or "localhost:8086")}
# Wait for the influxdb server to come online
count=0
while ! influx ping &>/dev/null; do
if [ "$count" -eq 300 ]; then
echo "Tried for 30 seconds, giving up..."
exit 1
fi
if ! kill -0 "$MAINPID"; then
echo "Main server died, giving up..."
exit 1
fi
sleep 0.1
count=$((count++))
done
# Do the initial database setup. Pass /dev/null as configs-path to
# avoid saving the token as the active config.
if test -e "$STATE_DIRECTORY/.first_startup"; then
influx setup \
--configs-path /dev/null \
--org ${escapeShellArg initCfg.organization} \
--bucket ${escapeShellArg initCfg.bucket} \
--username ${escapeShellArg initCfg.username} \
--password "$(< "$CREDENTIALS_DIRECTORY/admin-password")" \
--token "$(< "$CREDENTIALS_DIRECTORY/admin-token")" \
--retention ${escapeShellArg initCfg.retention} \
--force >/dev/null
rm -f "$STATE_DIRECTORY/.first_startup"
fi
''
);
};
users.extraUsers.influxdb2 = {
@ -63,5 +173,5 @@ in
users.extraGroups.influxdb2 = {};
};
meta.maintainers = with lib.maintainers; [ nickcao ];
meta.maintainers = with lib.maintainers; [ nickcao oddlama ];
}

10
nixos/modules/services/matrix/conduit.nix
View File

@ -94,6 +94,16 @@ in
instance will require manual migration of data.
'';
};
global.allow_check_for_updates = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to allow Conduit to automatically contact
<https://conduit.rs> hourly to check for important Conduit news.
Disabled by default because nixpkgs handles updates.
'';
};
};
};
default = {};

2
nixos/modules/services/networking/headscale.nix
View File

@ -292,7 +292,7 @@ in {
};
client_secret_path = mkOption {
type = types.nullOr types.path;
type = types.nullOr types.str;
default = null;
description = lib.mdDoc ''
Path to OpenID Connect client secret file. Expands environment variables in format ''${VAR}.

2
nixos/modules/services/security/oauth2_proxy.nix
View File

@ -579,7 +579,7 @@ in
description = "OAuth2 Proxy";
path = [ cfg.package ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
after = [ "network-online.target" ];
serviceConfig = {
User = "oauth2_proxy";

4
nixos/modules/services/web-apps/lemmy.nix
View File

@ -160,6 +160,10 @@ in
root * ${cfg.ui.package}/dist
file_server
}
handle_path /static/undefined/* {
root * ${cfg.ui.package}/dist
file_server
}
@for_backend {
path /api/* /pictrs/* /feeds/* /nodeinfo/*
}

2
nixos/modules/services/web-apps/photoprism.nix
View File

@ -123,7 +123,7 @@ in
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ];
SystemCallFilter = [ "@system-service" "~@setuid @keyring" ];
UMask = "0066";
} // lib.optionalAttrs (cfg.port < 1024) {
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

5
nixos/modules/services/x11/desktop-managers/budgie.nix
View File

@ -237,6 +237,11 @@ in {
budgie.budgie-control-center
];
# Register packages for udev.
services.udev.packages = with pkgs; [
budgie.magpie
];
# Shell integration for MATE Terminal.
programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true;

2
nixos/modules/services/x11/window-managers/dwm.nix
View File

@ -24,7 +24,7 @@ in
patches = [
(super.fetchpatch {
url = "https://dwm.suckless.org/patches/steam/dwm-steam-6.2.diff";
sha256 = "1ld1z3fh6p5f8gr62zknx3axsinraayzxw3rz1qwg73mx2zk5y1f";
sha256 = "sha256-f3lffBjz7+0Khyn9c9orzReoLTqBb/9gVGshYARGdVc=";
})
];
})

49
nixos/modules/system/boot/loader/grub/memtest.nix
View File

@ -1,12 +1,10 @@
# This module adds Memtest86+/Memtest86 to the GRUB boot menu.
# This module adds Memtest86+ to the GRUB boot menu.
{ config, lib, pkgs, ... }:
with lib;
let
memtest86 = pkgs.memtest86plus;
efiSupport = config.boot.loader.grub.efiSupport;
cfg = config.boot.loader.grub.memtest86;
in
@ -19,11 +17,8 @@ in
default = false;
type = types.bool;
description = lib.mdDoc ''
Make Memtest86+ (or MemTest86 if EFI support is enabled),
a memory testing program, available from the
GRUB boot menu. MemTest86 is an unfree program, so
this requires `allowUnfree` to be set to
`true`.
Make Memtest86+, a memory testing program, available from the GRUB
boot menu.
'';
};
@ -63,34 +58,12 @@ in
};
};
config = mkMerge [
(mkIf (cfg.enable && efiSupport) {
assertions = [
{
assertion = cfg.params == [];
message = "Parameters are not available for MemTest86";
}
];
boot.loader.grub.extraFiles = {
"memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
};
boot.loader.grub.extraEntries = ''
menuentry "Memtest86" {
chainloader /memtest86.efi
}
'';
})
(mkIf (cfg.enable && !efiSupport) {
boot.loader.grub.extraEntries = ''
menuentry "Memtest86+" {
linux16 @bootRoot@/memtest.bin ${toString cfg.params}
}
'';
boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
})
];
config = mkIf cfg.enable {
boot.loader.grub.extraEntries = ''
menuentry "Memtest86+" {
linux @bootRoot@/memtest.bin ${toString cfg.params}
}
'';
boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
};
}

21
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View File

@ -32,7 +32,7 @@ let
inherit (config.system.nixos) distroName;
memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86-efi;
memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus;
netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;
@ -147,10 +147,8 @@ in {
default = false;
type = types.bool;
description = lib.mdDoc ''
Make MemTest86 available from the systemd-boot menu. MemTest86 is a
program for testing memory. MemTest86 is an unfree program, so
this requires `allowUnfree` to be set to
`true`.
Make MemTest86+ available from the systemd-boot menu. MemTest86+ is a
program for testing memory.
'';
};
@ -193,8 +191,8 @@ in {
default = {};
example = literalExpression ''
{ "memtest86.conf" = '''
title MemTest86
efi /efi/memtest86/memtest86.efi
title MemTest86+
efi /efi/memtest86/memtest.efi
'''; }
'';
description = lib.mdDoc ''
@ -213,7 +211,7 @@ in {
type = types.attrsOf types.path;
default = {};
example = literalExpression ''
{ "efi/memtest86/memtest86.efi" = "''${pkgs.memtest86-efi}/BOOTX64.efi"; }
{ "efi/memtest86/memtest.efi" = "''${pkgs.memtest86plus}/memtest.efi"; }
'';
description = lib.mdDoc ''
A set of files to be copied to {file}`/boot`.
@ -276,11 +274,8 @@ in {
boot.loader.supportsInitrdSecrets = true;
boot.loader.systemd-boot.extraFiles = mkMerge [
# TODO: This is hard-coded to use the 64-bit EFI app, but it could probably
# be updated to use the 32-bit EFI app on 32-bit systems. The 32-bit EFI
# app filename is BOOTIA32.efi.
(mkIf cfg.memtest86.enable {
"efi/memtest86/BOOTX64.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
"efi/memtest86/memtest.efi" = "${pkgs.memtest86plus.efi}";
})
(mkIf cfg.netbootxyz.enable {
"efi/netbootxyz/netboot.xyz.efi" = "${pkgs.netbootxyz-efi}";
@ -291,7 +286,7 @@ in {
(mkIf cfg.memtest86.enable {
"${cfg.memtest86.entryFilename}" = ''
title MemTest86
efi /efi/memtest86/BOOTX64.efi
efi /efi/memtest86/memtest.efi
'';
})
(mkIf cfg.netbootxyz.enable {

2
nixos/release.nix
View File

@ -143,7 +143,7 @@ in rec {
manualHTML = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualHTML);
manual = manualHTML; # TODO(@oxij): remove eventually
manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));
manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);
nixos-configuration-reference-manpage = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.nixos-configuration-reference-manpage);
options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;

2
nixos/tests/all-tests.nix
View File

@ -367,6 +367,7 @@ in {
iftop = handleTest ./iftop.nix {};
incron = handleTest ./incron.nix {};
influxdb = handleTest ./influxdb.nix {};
influxdb2 = handleTest ./influxdb2.nix {};
initrd-network-openvpn = handleTest ./initrd-network-openvpn {};
initrd-network-ssh = handleTest ./initrd-network-ssh {};
initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {};
@ -572,6 +573,7 @@ in {
openresty-lua = handleTest ./openresty-lua.nix {};
opensmtpd = handleTest ./opensmtpd.nix {};
opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};
opensnitch = handleTest ./opensnitch.nix {};
openssh = handleTest ./openssh.nix {};
octoprint = handleTest ./octoprint.nix {};
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};

6
nixos/tests/budgie.nix
View File

@ -52,10 +52,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.wait_for_window("budgie-daemon")
machine.wait_until_succeeds("pgrep budgie-panel")
machine.wait_for_window("budgie-panel")
# We don't check xwininfo for this one.
# See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
machine.wait_until_succeeds("pgrep budgie-wm")
with subtest("Open MATE terminal"):
machine.succeed("su - ${user.name} -c 'DISPLAY=:0 mate-terminal >&2 &'")
machine.wait_for_window("Terminal")
with subtest("Check if budgie-wm has ever coredumped"):
machine.fail("coredumpctl --json=short | grep budgie-wm")
machine.sleep(20)
machine.screenshot("screen")
'';

36
nixos/tests/influxdb2.nix Normal file
View File

@ -0,0 +1,36 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "influxdb2";
meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
nodes.machine = { lib, ... }: {
environment.systemPackages = [ pkgs.influxdb2-cli ];
services.influxdb2.enable = true;
services.influxdb2.provision = {
enable = true;
initialSetup = {
organization = "default";
bucket = "default";
passwordFile = pkgs.writeText "admin-pw" "ExAmPl3PA55W0rD";
tokenFile = pkgs.writeText "admin-token" "verysecureadmintoken";
};
};
};
testScript = { nodes, ... }:
let
tokenArg = "--token verysecureadmintoken";
in ''
machine.wait_for_unit("influxdb2.service")
machine.fail("curl --fail -X POST 'http://localhost:8086/api/v2/signin' -u admin:wrongpassword")
machine.succeed("curl --fail -X POST 'http://localhost:8086/api/v2/signin' -u admin:ExAmPl3PA55W0rD")
out = machine.succeed("influx org list ${tokenArg}")
assert "default" in out
out = machine.succeed("influx bucket list ${tokenArg} --org default")
assert "default" in out
'';
})

62
nixos/tests/opensnitch.nix Normal file
View File

@ -0,0 +1,62 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "opensnitch";
meta = with pkgs.lib.maintainers; {
maintainers = [ onny ];
};
nodes = {
server =
{ ... }: {
networking.firewall.allowedTCPPorts = [ 80 ];
services.caddy = {
enable = true;
virtualHosts."localhost".extraConfig = ''
respond "Hello, world!"
'';
};
};
clientBlocked =
{ ... }: {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
};
};
clientAllowed =
{ ... }: {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
rules = {
opensnitch = {
name = "curl";
enabled = true;
action = "allow";
duration = "always";
operator = {
type ="simple";
sensitive = false;
operand = "process.path";
data = "${pkgs.curl}/bin/curl";
};
};
};
};
};
};
testScript = ''
start_all()
server.wait_for_unit("caddy.service")
server.wait_for_open_port(80)
clientBlocked.wait_for_unit("opensnitchd.service")
clientBlocked.fail("curl http://server")
clientAllowed.wait_for_unit("opensnitchd.service")
clientAllowed.succeed("curl http://server")
'';
})

3
nixos/tests/pantheon.nix
View File

@ -60,6 +60,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
with subtest("Open elementary terminal"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")
machine.wait_for_window("io.elementary.terminal")
with subtest("Check if gala has ever coredumped"):
machine.fail("coredumpctl --json=short | grep gala")
machine.sleep(20)
machine.screenshot("screen")
'';

10
nixos/tests/systemd-boot.nix
View File

@ -118,14 +118,11 @@ in
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
boot.loader.systemd-boot.memtest86.enable = true;
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"memtest86-efi"
];
};
testScript = ''
machine.succeed("test -e /boot/loader/entries/memtest86.conf")
machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi")
machine.succeed("test -e /boot/efi/memtest86/memtest.efi")
'';
};
@ -152,15 +149,12 @@ in
imports = [ common ];
boot.loader.systemd-boot.memtest86.enable = true;
boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf";
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"memtest86-efi"
];
};
testScript = ''
machine.fail("test -e /boot/loader/entries/memtest86.conf")
machine.succeed("test -e /boot/loader/entries/apple.conf")
machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi")
machine.succeed("test -e /boot/efi/memtest86/memtest.efi")
'';
};

2
nixos/tests/web-apps/mastodon/remote-postgresql.nix
View File

@ -13,7 +13,7 @@ let
in
{
name = "mastodon-remote-postgresql";
meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin turion ];
meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ];
nodes = {
database = {

36
pkgs/applications/audio/cava/default.nix
View File

@ -1,9 +1,25 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsa-lib, fftw,
libpulseaudio, ncurses, iniparser }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, alsa-lib
, fftw
, iniparser
, libpulseaudio
, ncurses
, pkgconf
}:
stdenv.mkDerivation rec {
pname = "cava";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "karlstav";
repo = "cava";
rev = version;
hash = "sha256-W/2B9iTcO2F2vHQzcbg/6pYBwe+rRNfADdOiw4NY9Jk=";
};
buildInputs = [
alsa-lib
@ -13,14 +29,14 @@ stdenv.mkDerivation rec {
iniparser
];
src = fetchFromGitHub {
owner = "karlstav";
repo = "cava";
rev = version;
sha256 = "sha256-mIgkvgVcbRdE29lSLojIzIsnwZgnQ+B2sgScDWrLyd8=";
};
nativeBuildInputs = [
autoreconfHook
pkgconf
];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''
echo ${version} > version
'';
meta = with lib; {
description = "Console-based Audio Visualizer for Alsa";

10
pkgs/applications/audio/helvum/default.nix
View File

@ -3,10 +3,8 @@
, clang
, desktop-file-utils
, fetchFromGitLab
, fetchpatch
, glib
, gtk4
, libclang
, meson
, ninja
, pipewire
@ -14,24 +12,25 @@
, rustPlatform
, rustc
, stdenv
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "helvum";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = pname;
rev = version;
hash = "sha256-TvjO7fGobGmAltVHeXWyMtMLANdVWVGvBYq20JD3mMI=";
hash = "sha256-nBU8dk22tzVf60yznTYJBYRKG+ctwWl1epU90R0zXr0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-W5Imlut30cjV4A6TCjBFLbViB0CDUucNsvIUiCXqu7I=";
hash = "sha256-kzu8dzKob9KxKEP3ElUYCCTdyvbzi+jSXTaaaaPMhYg=";
};
nativeBuildInputs = [
@ -43,6 +42,7 @@ stdenv.mkDerivation rec {
cargo
rustc
rustPlatform.bindgenHook
wrapGAppsHook4
];
buildInputs = [

2
pkgs/applications/audio/musescore/default.nix
View File

@ -162,7 +162,7 @@ in stdenv'.mkDerivation rec {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ vandenoever turion doronbehar ];
maintainers = with maintainers; [ vandenoever doronbehar ];
# on aarch64-linux:
# error: cannot convert '<brace-enclosed initializer list>' to 'float32x4_t' in assignment
broken = (stdenv.isLinux && stdenv.isAarch64);

8
pkgs/applications/audio/tidal-hifi/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tidal-hifi";
version = "5.5.0";
version = "5.6.0";
src = fetchurl {
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
sha256 = "sha256-pUQgTz7KZt4icD4lDAs4Wg095HxYEAifTM8a4cDejQM=";
sha256 = "sha256-HKylyYhbMxYfRRP9irGMTtB497o75M+ryikQHMJWbtU=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
postFixup = ''
makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
"''${gappsWrapperArgs[@]}"
substituteInPlace $out/share/applications/tidal-hifi.desktop \
--replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
@ -115,7 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
description = "The web version of Tidal running in electron with hifi support thanks to widevine";
homepage = "https://github.com/Mastermindzh/tidal-hifi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ qbit ];
maintainers = with lib.maintainers; [ qbit spikespaz ];
platforms = lib.platforms.linux;
mainProgram = "tidal-hifi";
};
})

16
pkgs/applications/blockchains/dcrd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "dcrd";
@ -11,10 +11,24 @@ buildGoModule rec {
hash = "sha256-ZNBSIzx07zJrBxas7bHpZ8ZPDWJ4d7jumpKYj5Qmzlo=";
};
patches = [
(fetchpatch {
name = "dcrd-appdata-env-variable.patch";
url = "https://github.com/decred/dcrd/pull/3152/commits/216132d7d852f3f2e2a6bf7f739f47ed62ac9387.patch";
hash = "sha256-R1GzP0qVP5XW1GnSJqFOpJVnwrVi/62tL1L2mc33+Dw=";
})
];
vendorHash = "sha256-++IPB2IadXd1LC5r6f1a0UqsTG/McAf7KQAw8WKKoaE=";
subPackages = [ "." "cmd/promptsecret" ];
__darwinAllowLocalNetworking = true;
preCheck = ''
export DCRD_APPDATA="$TMPDIR"
'';
meta = {
homepage = "https://decred.org";
description = "Decred daemon in Go (golang)";

6
pkgs/applications/blockchains/go-ethereum/default.nix
View File

@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.12.0";
version = "1.12.2";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u1p9k12tY79kA/2Hu109czQZnurHuDJQf/w7J0c8SuU=";
sha256 = "sha256-iCLOrf6/f0f7sD0YjmBtlcOcZRDIp9IZkBadTKj1Qjw=";
};
vendorHash = "sha256-k5MbOiJDvWFnaAPViNRHeqFa64XPZ3ImkkvkmTTscNA=";
vendorHash = "sha256-ChmQjhz4dQdwcY/269Hi5XAn8/+0z/AF7Kd9PJ8WqHg=";
doCheck = false;

6
pkgs/applications/display-managers/greetd/regreet.nix
View File

@ -2,9 +2,11 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
, glib
, gtk4
, pango
, librsvg
}:
rustPlatform.buildRustPackage rec {
@ -22,8 +24,8 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "gtk4_8" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk4 pango ];
nativeBuildInputs = [ pkg-config wrapGAppsHook];
buildInputs = [ glib gtk4 pango librsvg ];
meta = with lib; {
description = "Clean and customizable greeter for greetd";

29
pkgs/applications/editors/emacs/generic.nix
View File

@ -59,19 +59,6 @@
, webkitgtk
, wrapGAppsHook
# macOS dependencies for NS and macPort
, AppKit
, Carbon
, Cocoa
, GSS
, IOKit
, ImageCaptureCore
, ImageIO
, OSAKit
, Quartz
, QuartzCore
, WebKit
# Boolean flags
, nativeComp ? null
, withNativeCompilation ?
@ -87,6 +74,7 @@
, withGTK2 ? false
, withGTK3 ? withPgtk && !noGui
, withGconf ? false
, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
, withGpm ? stdenv.isLinux
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
, withMotif ? false
@ -109,6 +97,19 @@
else if withMotif then "motif"
else if withAthena then "athena"
else "lucid")
# macOS dependencies for NS and macPort
, AppKit
, Carbon
, Cocoa
, GSS
, IOKit
, ImageCaptureCore
, ImageIO
, OSAKit
, Quartz
, QuartzCore
, WebKit
}:
assert (withGTK2 && !withNS && variant != "macport") -> withX;
@ -244,7 +245,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
gtk3-x11
] ++ lib.optionals (withX && withMotif) [
motif
] ++ lib.optionals (withX && withXwidgets) [
] ++ lib.optionals withGlibNetworking [
glib-networking
] ++ lib.optionals withNativeCompilation [
libgccjit

7
pkgs/applications/editors/glow/default.nix
View File

@ -1,5 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "glow";
version = "1.5.0";
@ -23,5 +25,6 @@ buildGoModule rec {
changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne penguwin ];
mainProgram = "glow";
};
}

4
pkgs/applications/editors/jetbrains/default.nix
View File

@ -9,7 +9,7 @@
, python3
, icu
, lldb
, dotnet-sdk_6
, dotnet-sdk_7
, maven
, autoPatchelfHook
, libdbusmenu
@ -275,7 +275,7 @@ let
plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer
rm -rf lib/ReSharperHost/linux-x64/dotnet
ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet
ln -s ${dotnet-sdk_7} lib/ReSharperHost/linux-x64/dotnet
'');
});

146
pkgs/applications/editors/jetbrains/plugins/plugins.json
View File

@ -17,13 +17,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
},
"name": "ideavim"
},
@ -63,13 +63,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9225.18": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip"
},
"name": "ini"
},
@ -79,8 +79,8 @@
"phpstorm"
],
"builds": {
"231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
},
"name": "symfony-support"
},
@ -90,8 +90,8 @@
"phpstorm"
],
"builds": {
"231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
},
"name": "php-annotations"
},
@ -103,9 +103,9 @@
"rider"
],
"builds": {
"231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip"
"232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip"
},
"name": "python-community-edition"
},
@ -126,13 +126,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip"
},
"name": "rust"
},
@ -153,13 +153,13 @@
],
"builds": {
"223.8836.1185": null,
"231.9225.18": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip"
"232.8660.111": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
},
"name": "rust-beta"
},
@ -197,14 +197,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
"232.8660.111": null,
"232.8660.143": null,
"232.8660.185": null,
"232.8660.186": null,
"232.8660.197": null
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip"
},
"name": "nixidea"
},
@ -234,13 +234,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
},
"name": "csv-editor"
},
@ -261,13 +261,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
},
"name": "vscode-keymap"
},
@ -288,13 +288,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
},
"name": "eclipse-keymap"
},
@ -315,13 +315,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
},
"name": "visual-studio-keymap"
},
@ -342,13 +342,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
"232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.205": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"232.8660.212": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@ -368,14 +368,14 @@
"webstorm"
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip"
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip"
},
"name": "github-copilot"
},
@ -396,49 +396,41 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
"232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.205": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"232.8660.212": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
},
"files": {
"https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=",
"https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=",
"https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=",
"https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=",
"https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=",
"https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
"https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=",
"https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=",
"https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
"https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
"https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=",
"https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
"https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=",
"https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=",
"https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip": "sha256-pSbM2BkXrWdEVedLIh89sQ1FDnlgO+saXyZsfkI2qYA=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=",
"https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=",
"https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=",
"https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip": "sha256-qxTbWKdYSb4b6CRDKup7rL8EO2qZLM9bctMlTDHfrBk=",
"https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=",
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
"https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=",
"https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=",
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
"https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=",
"https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=",
"https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=",
"https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=",
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=",
"https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=",
"https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=",
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
"https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=",
"https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o="
}
}

48
pkgs/applications/editors/jetbrains/versions.json
View File

@ -67,10 +67,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2023.1.4",
"sha256": "7b44d704641c6015ce49e12e82c8866e9fdd8e8d421590235e536b3b1312b180",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.tar.gz",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "81345b7bf6f9bd844804a6d72f617dd9ced606508e5d34eba8cd83a8b115f556",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.tar.gz",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -92,10 +92,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.1.4",
"sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "1aa3436edb94cba8ec0e51605e146ecd528affa96e0e26df572c2437e9b00d2f",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.tar.gz",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -182,10 +182,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2023.1.4",
"sha256": "4d3d9005772d2136e44f7774377fae053b690501800ea5e650d0f35882690fdd",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.dmg",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "c8a3287383190113c65ec3c11fe808096faf581ce71953a258992900d97c377f",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.dmg",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -207,10 +207,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.1.4",
"sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "8041b79a64ac24578d8fe9c1ec02d91eb3b047164cf48713e988bc9a9c3d53d7",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.dmg",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@ -297,10 +297,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2023.1.4",
"sha256": "3285135fc4c529640ecfc5b451fa9b51d9df2a323915509cc6cbb3f25717c9e2",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4-aarch64.dmg",
"build_number": "231.9225.18",
"version": "2023.2",
"sha256": "365ed1ea1eb87f93abf581080c72866d693bfc60c4b8cd5682b5ec93f63ed4a9",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2-aarch64.dmg",
"build_number": "232.8660.205",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@ -322,10 +322,10 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.1.4",
"sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg",
"build_number": "231.9225.23"
"version": "2023.2",
"sha256": "c5168f8ce698b5ddea7652f88b652239f87e87fa51438ac358aa8a44a3686272",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2-aarch64.dmg",
"build_number": "232.8660.212"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",

6
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -25,16 +25,16 @@
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "neovide";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "neovide";
repo = "neovide";
rev = version;
sha256 = "sha256-OIAGqr34QcpYVUTcW+aPoGeBez/VuT6sSFC5JQaodOI=";
sha256 = "sha256-zvpeDaLQvFQn5VfG6lsula/20AF3Oitsq7bLn8TkUiE=";
};
cargoSha256 = "sha256-SMix6lKBkje0o+SxTK7AVSd+QbUyTlu4yPZ3bxnpggg=";
cargoSha256 = "sha256-4PgwIdi511ScTLwrz89nf/YPJwEKMUgUKbKxLDzBViM=";
SKIA_SOURCE_DIR =
let

4
pkgs/applications/editors/orbiton/default.nix
View File

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
version = "2.62.7";
version = "2.63.1";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
hash = "sha256-NQBFplrYh33zcKfXrcZpWrF3Uac7YXdxh3D+wixEzP0=";
hash = "sha256-ZUbWptE5BckAm/14ZPGJqTbbACC9cDOUUmzzmvuNUSA=";
};
vendorHash = null;

62
pkgs/applications/editors/uivonim/default.nix
View File

@ -1,66 +1,38 @@
{ lib, mkYarnPackage, fetchFromGitHub, electron, makeWrapper }:
{ lib
, buildNpmPackage
, fetchFromGitHub
, electron
, makeWrapper
}:
mkYarnPackage rec {
buildNpmPackage rec {
pname = "uivonim";
version = "unstable-2021-05-24";
version = "0.29.0";
src = fetchFromGitHub {
owner = "smolck";
repo = pname;
rev = "ac027b4575b7e1adbedde1e27e44240289eebe39";
sha256 = "1b6k834qan8vhcdqmrs68pbvh4b59g9bx5126k5hjha6v3asd8pj";
rev = "v${version}";
hash = "sha256-TcsKjRwiCTRQLxolRuJ7nRTGxFC0V2Q8LQC5p9iXaaY=";
};
# The spectron dependency has to be removed manually from package.json,
# because it requires electron-chromedriver, which wants to download stuff.
# It is also good to remove the electron-builder bloat.
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
npmDepsHash = "sha256-jWLvsN6BCxTWn/Lc0fSz0VJIUiFNN8ptSYMeWlWsHXc=";
yarnPreBuild = ''
# workaround for missing opencollective-postinstall
mkdir -p $TMPDIR/bin
touch $TMPDIR/bin/opencollective-postinstall
chmod +x $TMPDIR/bin/opencollective-postinstall
export PATH=$PATH:$TMPDIR/bin
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
'';
# We build (= webpack) uivonim in a separate package,
# because this requires devDependencies that we do not
# wish to bundle (because they add 250M to the closure size).
build = mkYarnPackage {
name = "uivonim-build-${version}";
inherit version src packageJSON yarnLock yarnNix yarnPreBuild distPhase;
buildPhase = ''
yarn build:prod
'';
installPhase = ''
mv deps/uivonim/build $out
'';
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
};
# The --production flag disables the devDependencies.
yarnFlags = [ "--production" ];
npmFlags = [ "--ignore-scripts" ];
npmBuildScript = "build:prod";
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
dir=$out/libexec/uivonim/node_modules/uivonim/
# need to copy instead of symlink because
# otherwise electron won't find the node_modules
cp -ra ${build} $dir/build
makeWrapper ${electron}/bin/electron $out/bin/uivonim \
--set NODE_ENV production \
--add-flags $dir/build/main/main.js
--add-flags $out/lib/node_modules/uivonim/build/main/main.js
'';
distPhase = ":"; # disable useless $out/tarballs directory
meta = with lib; {
homepage = "https://github.com/smolck/uivonim";
description = "Cross-platform GUI for neovim based on electron";

71
pkgs/applications/editors/uivonim/package.json
View File

@ -1,71 +0,0 @@
{
"name": "uivonim",
"author": "smolck",
"license": "AGPL-3.0-only",
"version": "0.28.0",
"description": "Extensible Neovim GUI forked from Veonim",
"main": "build/main/main.js",
"scripts": {
"dev": "npm run build && electron build/main/main.js",
"prod": "npm run build:prod && NODE_ENV=production electron build/main/main.js",
"prod:start": "NODE_ENV=production electron build/main/main.js",
"build": "node tools/build.js",
"build:prod": "node tools/build-prod.js",
"check-types": "tsc -p src/tsconfig.json --noEmit",
"package": "npm run build:prod && electron-builder",
"test": "mocha \"test/unit/**/*.js\"",
"test:e2e": "mocha test/e2e -t 0",
"test:e2e:snapshot": "npm run test:e2e -- --snapshot",
"test:integration": "mocha test/integration -t 10000",
"test:watch": "npm run test -- -w",
"test:integration:watch": "npm run test:integration -- -w",
"gen:font-sizes": "electron tools/font-sizer/index.js",
"unused-exports": "ts-unused-exports src/tsconfig.json"
},
"repository": {
"type": "git",
"url": "git+https://github.com/smolck/uivonim.git"
},
"bugs": {
"url": "https://github.com/smolck/uivonim/issues"
},
"homepage": "https://github.com/smolck/uivonim",
"dependencies": {
"feather-icons": "^4.28.0",
"fuzzaldrin-plus": "^0.6.0",
"highlight.js": "^10.7.2",
"inferno": "^7.4.8",
"marked": "^2.0.5",
"neovim": "^4.10.0",
"ts-node": "^10.0.0"
},
"devDependencies": {
"@babel/cli": "^7.14.3",
"@babel/core": "^7.14.3",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.14.2",
"@babel/plugin-transform-modules-commonjs": "^7.14.0",
"@babel/preset-typescript": "^7.13.0",
"@medv/finder": "^2.0.0",
"@types/fuzzaldrin-plus": "^0.6.1",
"@types/marked": "^2.0.3",
"@types/node": "^15.6.0",
"@types/webgl2": "0.0.6",
"babel-loader": "^8.2.2",
"babel-plugin-inferno": "^6.2.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"electron": "^12.0.9",
"electron-devtools-installer": "^3.2.0",
"fs-extra": "^10.0.0",
"mocha": "^8.4.0",
"path-browserify": "^1.0.1",
"prettier": "2.3.0",
"proxyquire": "^2.1.3",
"ts-loader": "^9.2.2",
"ts-unused-exports": "^7.0.3",
"ttypescript": "^1.5.12",
"typescript": "^4.2.4",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0"
}
}

5062
pkgs/applications/editors/uivonim/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5725
pkgs/applications/editors/uivonim/yarn.nix
View File

File diff suppressed because it is too large Load Diff

331
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -967,12 +967,12 @@ final: prev:
base46 = buildVimPluginFrom2Nix {
pname = "base46";
version = "2023-07-29";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "nvchad";
repo = "base46";
rev = "1a3faca5fdb6da541a28c37efdb60d99b34c15cc";
sha256 = "1yjhfd8cc8k449qxbf4c7mm5fgi3qblbh6775byrib73hbli7p2c";
rev = "e56d8b27addf13504ac112ecdb37acb5ac16065b";
sha256 = "0wzi5fkzdxx5xcbs20a9a52yb8b6v60gbd8j3n76bppss06h0lmg";
};
meta.homepage = "https://github.com/nvchad/base46/";
};
@ -1235,8 +1235,8 @@ final: prev:
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "7dbc8b17c6d22a7511a8818636a8f7a428cf56f8";
sha256 = "1vqw7g4kqjrcjfqzq4r995lh0yc466pa88d24ii38vwzmzp27z10";
rev = "f897f9caaee339c8447280838c6d0c6770ef534a";
sha256 = "1ckpch1i1d3lfmrm5mxw9dikrbsa2mhp5q3fwm7yrlx1mlvh1ahg";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -2033,6 +2033,18 @@ final: prev:
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
codewindow-nvim = buildVimPluginFrom2Nix {
pname = "codewindow.nvim";
version = "2023-07-23";
src = fetchFromGitHub {
owner = "gorbit99";
repo = "codewindow.nvim";
rev = "11fb5520898d22a563fe6a124a61c0d2887f3d3f";
sha256 = "1rnw5z3vwc183gvk3v3xciyzgqwfp0jsd5vckj5gpig1lg9l4yzf";
};
meta.homepage = "https://github.com/gorbit99/codewindow.nvim/";
};
codi-vim = buildVimPluginFrom2Nix {
pname = "codi.vim";
version = "2023-02-28";
@ -2947,6 +2959,18 @@ final: prev:
meta.homepage = "https://github.com/direnv/direnv.vim/";
};
distant-nvim = buildVimPluginFrom2Nix {
pname = "distant.nvim";
version = "2023-07-24";
src = fetchFromGitHub {
owner = "chipsenkbeil";
repo = "distant.nvim";
rev = "17bcd37f8d91dcb987456be456d8a95db1a772ba";
sha256 = "0z6if0p7n8bi5gd4p3h7i7z3kq8q2yr864nfq0bvzy9ps131z9wl";
};
meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/";
};
doki-theme-vim = buildVimPluginFrom2Nix {
pname = "doki-theme-vim";
version = "2023-01-07";
@ -3299,12 +3323,12 @@ final: prev:
firenvim = buildVimPluginFrom2Nix {
pname = "firenvim";
version = "2023-08-07";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "glacambre";
repo = "firenvim";
rev = "2a709e2bf9e2ff065e13619d21b5a672e51023f6";
sha256 = "1bk5fdsv55cydbqli86xq9fw170qm46zi3m7l1jfz2hd1dlw4q1z";
rev = "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5";
sha256 = "0fi5rf408ii5k3zkjkvc2n8n18g1wd54c3k4a8ir0bzgsiwqv767";
};
meta.homepage = "https://github.com/glacambre/firenvim/";
};
@ -3418,6 +3442,18 @@ final: prev:
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
fold-preview-nvim = buildVimPluginFrom2Nix {
pname = "fold-preview.nvim";
version = "2023-01-27";
src = fetchFromGitHub {
owner = "anuvyklack";
repo = "fold-preview.nvim";
rev = "b7920cb0aba2b48a6b679bff45f98c3ebc0f0b89";
sha256 = "1hjzwcs7cdyf8sn3hj4vl5zpn3lzd2qvsg44wzvlslnynqcxkg0l";
};
meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/";
};
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
version = "2023-07-13";
@ -3852,12 +3888,12 @@ final: prev:
grammar-guard-nvim = buildVimPluginFrom2Nix {
pname = "grammar-guard.nvim";
version = "2022-01-03";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "brymer-meneses";
repo = "grammar-guard.nvim";
rev = "ea163c4adfd68fdd40e095cdf39cb506bf3ce3b2";
sha256 = "0wdbpkg1y0s7fhaybyj735dxdkvfgnng49i8k0zrsy16d75md4bs";
rev = "265e5a0eba8cf5b14702a93841b218d4c05be43b";
sha256 = "040m6gpvgqh1h9cysbbrmklbf5vw13ij4ffvxbnzs33xfbl8q058";
};
meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/";
};
@ -4150,12 +4186,12 @@ final: prev:
hotpot-nvim = buildVimPluginFrom2Nix {
pname = "hotpot.nvim";
version = "2023-08-11";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "hotpot.nvim";
rev = "42cb3f364a7ac6c2dfca08c8b86f950b00097657";
sha256 = "0y1049gmg6ia594ms00hx485d06cjmj9g65wgqnmziyjkssvbjan";
rev = "e5bb83d608271a9d977718f30f1b6bc9bd1b0dbe";
sha256 = "18nakf34apry57c4b3jprkc40ixg4p3a4nws7rh9i5dfi504blr7";
};
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
@ -4246,12 +4282,12 @@ final: prev:
image-nvim = buildVimPluginFrom2Nix {
pname = "image.nvim";
version = "2023-07-17";
version = "2023-07-22";
src = fetchFromGitHub {
owner = "3rd";
repo = "image.nvim";
rev = "24c312191ca6bc04e45610a7bcb984d3bf208820";
sha256 = "1fy024nd01wryrasibc4b8divcfzx3a7xxfzx968l4a4l1q3l6vc";
rev = "5d8b8b3acbe2ec6fcfe782cbda3a8ebdad9c1b51";
sha256 = "0s7s803gg2b4wilfx973kf4c2gppsyr747wkwjlms3yjbx8iyb8k";
};
meta.homepage = "https://github.com/3rd/image.nvim/";
};
@ -4581,6 +4617,18 @@ final: prev:
meta.homepage = "https://github.com/kmonad/kmonad-vim/";
};
knap = buildVimPluginFrom2Nix {
pname = "knap";
version = "2023-07-25";
src = fetchFromGitHub {
owner = "frabjous";
repo = "knap";
rev = "503010f541696e99ed5c62f658620e546cebf8b0";
sha256 = "1aqfy1c4h95p94npdvyd7dhkr19f4qbnmr05sg1wbvqd9lfkslym";
};
meta.homepage = "https://github.com/frabjous/knap/";
};
kommentary = buildVimPluginFrom2Nix {
pname = "kommentary";
version = "2023-01-06";
@ -5265,6 +5313,18 @@ final: prev:
meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/";
};
markid = buildVimPluginFrom2Nix {
pname = "markid";
version = "2023-07-01";
src = fetchFromGitHub {
owner = "David-Kunz";
repo = "markid";
rev = "46d03e1b7d82c07bbf06ef2f6595fea73ae6410b";
sha256 = "1mk96p5if9zd3apv7d2kn4c3h2ik39v80apr0qf10h8lwx5zx19c";
};
meta.homepage = "https://github.com/David-Kunz/markid/";
};
marks-nvim = buildVimPluginFrom2Nix {
pname = "marks.nvim";
version = "2023-02-25";
@ -5385,14 +5445,26 @@ final: prev:
meta.homepage = "https://github.com/savq/melange-nvim/";
};
mind-nvim = buildVimPluginFrom2Nix {
pname = "mind.nvim";
version = "2023-03-22";
src = fetchFromGitHub {
owner = "phaazon";
repo = "mind.nvim";
rev = "002137dd7cf97865ebd01b6a260209d2daf2da66";
sha256 = "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214";
};
meta.homepage = "https://github.com/phaazon/mind.nvim/";
};
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-08-08";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "1b52c4ce7880b95d6c80eeb3cfe8e2da27d19db4";
sha256 = "02262ykxldwxhwf6aw0q9hsz3qda43qcj770hmr1fn6xmg4b6zyl";
rev = "654c723046d8f06151c7e940819c66030df011e7";
sha256 = "1glvdrws6q2ynmmnhhw88704lb1q5npqnl4vwls8yy3pvwwz78l8";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5505,6 +5577,18 @@ final: prev:
meta.homepage = "https://github.com/yegappan/mru/";
};
nabla-nvim = buildVimPluginFrom2Nix {
pname = "nabla.nvim";
version = "2023-04-22";
src = fetchFromGitHub {
owner = "jbyuki";
repo = "nabla.nvim";
rev = "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e";
sha256 = "17iw6ca9b8mrw68f4zkghnf3if76yrpj5fn8cp8829zpm722l6b1";
};
meta.homepage = "https://github.com/jbyuki/nabla.nvim/";
};
ncm2 = buildVimPluginFrom2Nix {
pname = "ncm2";
version = "2022-03-17";
@ -5735,24 +5819,24 @@ final: prev:
neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim";
version = "2023-07-31";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neco-vim";
rev = "c1803742fed623212e675909ed74657cf6a77a2f";
sha256 = "1w4gqdjiv624izl5j92sjrrc2p72k9vq6pq1gwkyvhhvvaqnxhzs";
rev = "98f142bc8279d467e4e8ad81f1f007b1fe13d0a1";
sha256 = "0a5v767ad746m4vhzj5lq11h7zxc78zz4mxs4dr0s5n9a3g6z9sl";
};
meta.homepage = "https://github.com/Shougo/neco-vim/";
};
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
version = "2023-08-07";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
rev = "38293fe690981aba6cfef5e440f26d8b956d463e";
sha256 = "1mr6wllc1nv6zdrw4hzya5hmhzw1vclfim6f90xhln3vkbyci88b";
rev = "76c43f4017b26127b4749570f947385d0c872224";
sha256 = "12qja6fw5pmpwn914gmgkk0ck55g61z9ndlqpadk1z8d3939rnbp";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@ -5795,24 +5879,24 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2023-08-10";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "81a893eb94d502b2cbb08ed3871eeaadfd240131";
sha256 = "1b3lhl2hr42vhh7nvjhm4isp034n80il4d5x6b415vcacc0187ag";
rev = "9a5c0f0de5c15fba52d4fb83d425d3f4fa7abfa1";
sha256 = "1yvshl98nlza20lzay9q3rwv16xcnbrvjiwqn0f71zxrs7hzzs66";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2023-08-03";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "08a621bd659511379e753970a4f3adebd45be8f4";
sha256 = "04dbccd9nfqj2vv5iv7a9fdz2mdk8kvpyd5gqwjzwsy84v7qx89h";
rev = "159e3e24fc018e16a937286488be17602aff8e3c";
sha256 = "1fyg3s8sqavmg5gqvpfdrywbyx8rfg2qrkc7qlhgs767k6dnp1vw";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@ -5831,12 +5915,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-08-11";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
rev = "e80cd6424a8a85d93bac25b8cd8d1758105f2b0f";
sha256 = "1x5cp250qim36l63qgikqpygmsdcciq7i69gcs3qfx9jxfgih4fh";
rev = "b92d229086f201b983f561a41f3eb18fef7f0e53";
sha256 = "00xwhyiwcyrmbh9zmlbxsrw956vafnn673vdrg06rfx9mqkjzy2f";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@ -5889,6 +5973,18 @@ final: prev:
meta.homepage = "https://github.com/rafamadriz/neon/";
};
neorepl-nvim = buildVimPluginFrom2Nix {
pname = "neorepl.nvim";
version = "2022-11-07";
src = fetchFromGitHub {
owner = "ii14";
repo = "neorepl.nvim";
rev = "bc819bb42edca9c4a6b6e5d00f09f94a49c3b735";
sha256 = "05fd3ygqpw5vyqgwc7iwbm8a7y70fl438khp6lz62bcsdd28yirs";
};
meta.homepage = "https://github.com/ii14/neorepl.nvim/";
};
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-08-09";
@ -6215,12 +6311,12 @@ final: prev:
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2023-06-26";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
rev = "ab2ae4d502a26bc591db78a8548823ddd04bbc9c";
sha256 = "1my8nkc1fvs1awlzxqdy8q4448niwbg9ay5jliwly8aiiaxp2qvr";
rev = "d2e21d417f6c788b11ae3b90d7ac478930dead36";
sha256 = "140xp1kqj76gyn440bs62ff85b4xvlvxiyidvb5r4w0imrlacnpc";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
@ -6455,12 +6551,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2023-07-06";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "db09b6c691def0038c456551e4e2772186449f35";
sha256 = "133qcapq5klinnbhvbqmww5ibwfrrqn9ysg5gjx1kg2vva7nv8p8";
rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7";
sha256 = "00nkg77y9mp7ac46bdcaga36bbbrwbp7k1d6ajjgg9qf76pk8q3i";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -6599,12 +6695,12 @@ final: prev:
nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp";
version = "2023-08-10";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "3b9f28061a67b19cadc13946de981426a6425e4a";
sha256 = "11vxrizzkgk3x2hnd5cjdg53m5hjlf8548hi8aqfnfpr977d3v9s";
rev = "51f1e11a89ec701221877532ee1a23557d291dd5";
sha256 = "11v940v6md7sj1digh7kwckb80zbxxp3shlszi44c43iw9viznxi";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@ -6815,12 +6911,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
version = "2023-08-11";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
rev = "a15b1a6a060d77e5a0047ac2962b90c0d47c9903";
sha256 = "088n6ix7hz0k49ykwmpyxphw7mqs1dxdkl43ba0b9nnwbfr6ii1z";
rev = "31511c2b27b7c69ab64e6b369d54cbd4b82348e2";
sha256 = "1ff1b9wgi3711hyx0xr48g4wis0x5hhsrymclrpjiykyvmrjibc2";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@ -6909,6 +7005,17 @@ final: prev:
meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/";
};
nvim-julia-autotest = buildVimPluginFrom2Nix {
pname = "nvim-julia-autotest";
version = "2022-10-31";
src = fetchgit {
url = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f";
sha256 = "0jd6r5chh4rdj1jyrsqhb67glwqjcygzvk8gyp0v7axr2xn6r8r1";
};
meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
};
nvim-lastplace = buildVimPluginFrom2Nix {
pname = "nvim-lastplace";
version = "2023-07-27";
@ -7203,12 +7310,24 @@ final: prev:
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "f3991f78682fd24ad65d936d55715f4c7363016e";
sha256 = "0csf3z48zl3zbj255sd0h823ggi4y2lg6gxy8qr4j0gwrphq1qsc";
rev = "69edd48b8cf0b0502566a436967b78f42ca56a14";
sha256 = "1s8vb06v6hcr71kv4jia2h1kjcd2wci7bcd1imhiqbkh5y5pxh2a";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
nvim-search-and-replace = buildVimPluginFrom2Nix {
pname = "nvim-search-and-replace";
version = "2022-09-06";
src = fetchFromGitHub {
owner = "s1n7ax";
repo = "nvim-search-and-replace";
rev = "1b455cf945c42fa28f95d111d1a1110d24b37175";
sha256 = "054qj69i45lgjflzrfck4jdmsl41mfvk9d092h68a19znsms1i30";
};
meta.homepage = "https://github.com/s1n7ax/nvim-search-and-replace/";
};
nvim-snippy = buildVimPluginFrom2Nix {
pname = "nvim-snippy";
version = "2023-05-15";
@ -7319,12 +7438,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-08-11";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "fa414da96f4a2e60c2ac8082f0c1802b8f3c8f6c";
sha256 = "027702lqkkn1pmwnypmwx1s8bz6lg6ix882g1rcwyrpn3lb85489";
rev = "800b2f388b0f880be8a2fcd29494f7459af30a21";
sha256 = "18zyqj9s071fx8i9m3rmwsy98rv6h2mcl2i8vblhaa55nv6f7y4j";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7389,6 +7508,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-treesitter-textsubjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textsubjects";
version = "2023-08-03";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-treesitter-textsubjects";
rev = "df75fcec548014f158cda6498ac38c4622c221e1";
sha256 = "0fx8b9w03zn6v8db2w6h29y8hpbjckvm27nh49vvsis3icqyk7iv";
};
meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/";
};
nvim-ts-autotag = buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag";
version = "2023-06-16";
@ -7448,6 +7579,18 @@ final: prev:
meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
};
nvim-unception = buildVimPluginFrom2Nix {
pname = "nvim-unception";
version = "2023-04-11";
src = fetchFromGitHub {
owner = "samjwill";
repo = "nvim-unception";
rev = "0cbf11a6c5c4314e88245b69d460f85f30885d2e";
sha256 = "12fy3nchbg7w8yyhk1ym5amx8kvvx73wmlqgi8ss2ikywc7n5d0c";
};
meta.homepage = "https://github.com/samjwill/nvim-unception/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2023-08-09";
@ -7558,12 +7701,12 @@ final: prev:
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
version = "2023-08-09";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
rev = "0e5fca35cdc743cf3a448cea1a6251cf25cebafa";
sha256 = "16imjy6hyy9k1s6krkwl1z5vlra81a6fig2553hmwgndi7cjg3x8";
rev = "0ccf95ae5d0ea731de8d427304f95d384a0664c4";
sha256 = "0md4ih34kcfs15vf9g1acnnyzpcja214zdzr8yxzis9idqyh3liz";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@ -7882,6 +8025,18 @@ final: prev:
meta.homepage = "https://github.com/motus/pig.vim/";
};
plantuml-previewer-vim = buildVimPluginFrom2Nix {
pname = "plantuml-previewer.vim";
version = "2023-03-07";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "plantuml-previewer.vim";
rev = "1dd4d0f2b09cd80a217f76d82f93830dbbe689b3";
sha256 = "0pvdiyyqd9j65q9wf3y6jxgry4lxvnbd2ah1761a4vbn02zdrr2v";
};
meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/";
};
plantuml-syntax = buildVimPluginFrom2Nix {
pname = "plantuml-syntax";
version = "2022-08-26";
@ -8003,6 +8158,18 @@ final: prev:
meta.homepage = "https://github.com/ewilazarus/preto/";
};
pretty-fold-nvim = buildVimPluginFrom2Nix {
pname = "pretty-fold.nvim";
version = "2022-07-20";
src = fetchFromGitHub {
owner = "anuvyklack";
repo = "pretty-fold.nvim";
rev = "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5";
sha256 = "0fjjd5zyh588czz886v29wff8jy5fwa4nbjfailwph4p9b1xj0rx";
};
meta.homepage = "https://github.com/anuvyklack/pretty-fold.nvim/";
};
prev_indent = buildVimPluginFrom2Nix {
pname = "prev_indent";
version = "2014-03-08";
@ -9306,24 +9473,24 @@ final: prev:
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
pname = "telescope-file-browser.nvim";
version = "2023-07-30";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-file-browser.nvim";
rev = "6fe423eea6604c2fcbb906ff5f7e27f748a6ed87";
sha256 = "1hckw1jq0azx33sqawganlk256a88vzifa3f4x0h1q4579j38n1x";
rev = "0e054a9dd786280a4226c50e85e447992f6b3ff0";
sha256 = "1a4q9dfmb5dbsznbpnd3iaqnysa1y29jnpy6kqhk22iwqgj8hwnz";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
};
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency.nvim";
version = "2023-08-11";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "9b17c177447915f066cf78952892fe771c3e43c5";
sha256 = "0c9f7ahlhvky1n9wkc4vfkbiqnwf5d6b4mphcj7grrpm1imxfj8d";
rev = "2ac311a2666edb447db5139b326777c44adc1e2a";
sha256 = "1p8wi76mpr6gsyksbf7xcd6b4888csrrgj1g6hif9yb3d6r7fzm6";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -9957,12 +10124,12 @@ final: prev:
typescript-nvim = buildVimPluginFrom2Nix {
pname = "typescript.nvim";
version = "2023-06-28";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "typescript.nvim";
rev = "de304087e6e49981fde01af8ccc5b21e8519306f";
sha256 = "0l3i9fj76y3yl63fh6hprs5fja0h0jl11lidv3p76bdr041gw06g";
rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467";
sha256 = "0rx29i3hmzh2knxx098fvfc0iafx3j08bs1zbv4dxadq56dnhaxm";
};
meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
};
@ -11887,6 +12054,18 @@ final: prev:
meta.homepage = "https://github.com/rhysd/vim-grammarous/";
};
vim-graphical-preview = buildVimPluginFrom2Nix {
pname = "vim-graphical-preview";
version = "2022-11-28";
src = fetchFromGitHub {
owner = "bytesnake";
repo = "vim-graphical-preview";
rev = "d5692493d33d5c9d776e94c9d77493741a3293c8";
sha256 = "1w7w46359s9s8n2ndihd39bwv69jc4nwjsjy3bgzgrd2qni9xf6p";
};
meta.homepage = "https://github.com/bytesnake/vim-graphical-preview/";
};
vim-graphql = buildVimPluginFrom2Nix {
pname = "vim-graphql";
version = "2023-01-16";
@ -13368,12 +13547,12 @@ final: prev:
vim-pasta = buildVimPluginFrom2Nix {
pname = "vim-pasta";
version = "2018-09-08";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "ku1ik";
repo = "vim-pasta";
rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66";
sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq";
rev = "2b786703eef9f82ae7a56f3de4ee43e1e5efaaa5";
sha256 = "1q4d512rq57awasb441slqp29mkzi3jxmy8clrp2s9ydwdbndwlx";
};
meta.homepage = "https://github.com/ku1ik/vim-pasta/";
};
@ -15458,12 +15637,12 @@ final: prev:
yats-vim = buildVimPluginFrom2Nix {
pname = "yats.vim";
version = "2023-08-04";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
rev = "6d569339acf5866c468df9c2a06e050c0407ada3";
sha256 = "1zz38g545ar0jis3i8dasfdifnnd0l40q6pclwphwspx6idlzajd";
rev = "8878bdd7fc01eec647267d4433a763474b6a5db4";
sha256 = "0070r63v9kjl3cx9w8xsilyww9nwyharc6l274y7mg4bfhddpbr3";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
@ -15757,6 +15936,18 @@ final: prev:
meta.homepage = "https://github.com/rose-pine/neovim/";
};
samodostal-image-nvim = buildVimPluginFrom2Nix {
pname = "samodostal-image-nvim";
version = "2023-06-08";
src = fetchFromGitHub {
owner = "samodostal";
repo = "image.nvim";
rev = "dcabdf47b0b974b61d08eeafa2c519927e37cf27";
sha256 = "1c0s460nzw1imvvzj6b9hsalv60jmcyrfga5gldbskz58hyj739m";
};
meta.homepage = "https://github.com/samodostal/image.nvim/";
};
tinykeymap = buildVimPluginFrom2Nix {
pname = "tinykeymap";
version = "2019-03-15";

12
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -1929,12 +1929,12 @@
};
teal = buildGrammar {
language = "teal";
version = "0.0.0+rev=2158ecc";
version = "0.0.0+rev=33482c9";
src = fetchFromGitHub {
owner = "euclidianAce";
repo = "tree-sitter-teal";
rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2";
hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E=";
rev = "33482c92a0dfa694491d34e167a1d2f52b0dccb1";
hash = "sha256-6T9hn+Tvz8AYMsAu2J8vt6WkRQRrdGwGJcw3c85W14I=";
};
generate = true;
meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal";
@ -2187,12 +2187,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=f416d4b";
version = "0.0.0+rev=9399564";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "f416d4b76141d803ea2ebadf0629fca164133723";
hash = "sha256-xSt6C64PmNJOqZxon4TWbAIlMzSaRClPc47wi9Sxdpk=";
rev = "9399564d1e32864c6af2d49c0dcd1f76d54443f2";
hash = "sha256-Me+AhVl0a38w54vWa4yvxOPHMwVnJw1wewrn0bBC9AM=";
};
location = "libs/tree-sitter-wing";
generate = true;

15
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -169,6 +169,7 @@ https://github.com/iamcco/coc-tailwindcss/,,
https://github.com/neoclide/coc.nvim/,release,
https://github.com/manicmaniac/coconut.vim/,HEAD,
https://github.com/Exafunction/codeium.vim/,HEAD,
https://github.com/gorbit99/codewindow.nvim/,HEAD,
https://github.com/metakirby5/codi.vim/,,
https://github.com/tjdevries/colorbuddy.nvim/,,
https://github.com/lilydjwg/colorizer/,,
@ -245,6 +246,7 @@ https://github.com/monaqa/dial.nvim/,HEAD,
https://github.com/sindrets/diffview.nvim/,,
https://github.com/elihunter173/dirbuf.nvim/,HEAD,
https://github.com/direnv/direnv.vim/,,
https://github.com/chipsenkbeil/distant.nvim/,HEAD,
https://github.com/doki-theme/doki-theme-vim/,,
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
@ -285,6 +287,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
https://github.com/fhill2/floating.nvim/,,
https://github.com/floobits/floobits-neovim/,,
https://github.com/akinsho/flutter-tools.nvim/,HEAD,
https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
https://github.com/mhartington/formatter.nvim/,,
https://github.com/megaannum/forms/,,
https://github.com/rafamadriz/friendly-snippets/,,
@ -356,6 +359,7 @@ https://github.com/cocopon/iceberg.vim/,,
https://github.com/idris-hackers/idris-vim/,,
https://github.com/edwinb/idris2-vim/,,
https://github.com/3rd/image.nvim/,HEAD,
https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
https://github.com/lewis6991/impatient.nvim/,,
https://github.com/smjonas/inc-rename.nvim/,HEAD,
https://github.com/nishigori/increment-activator/,,
@ -383,6 +387,7 @@ https://github.com/JuliaEditorSupport/julia-vim/,,
https://github.com/rebelot/kanagawa.nvim/,,
https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
https://github.com/kmonad/kmonad-vim/,,
https://github.com/frabjous/knap/,HEAD,
https://github.com/b3nj5m1n/kommentary/,,
https://github.com/udalov/kotlin-vim/,,
https://github.com/qnighy/lalrpop.vim/,,
@ -440,6 +445,7 @@ https://github.com/mkasa/lushtags/,,
https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD,
https://github.com/winston0410/mark-radar.nvim/,HEAD,
https://github.com/iamcco/markdown-preview.nvim/,,
https://github.com/David-Kunz/markid/,HEAD,
https://github.com/chentoast/marks.nvim/,,
https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
@ -450,6 +456,7 @@ https://github.com/kaicataldo/material.vim/,HEAD,
https://github.com/vim-scripts/mayansmoke/,,
https://github.com/chikamichi/mediawiki.vim/,HEAD,
https://github.com/savq/melange-nvim/,,
https://github.com/phaazon/mind.nvim/,HEAD,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/wfxr/minimap.vim/,,
https://github.com/jghauser/mkdir.nvim/,main,
@ -461,6 +468,7 @@ https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
https://github.com/leafo/moonscript-vim/,HEAD,
https://github.com/yegappan/mru/,,
https://github.com/jbyuki/nabla.nvim/,HEAD,
https://github.com/ncm2/ncm2/,,
https://github.com/ncm2/ncm2-bufword/,,
https://github.com/ncm2/ncm2-cssomni/,,
@ -493,6 +501,7 @@ https://github.com/Shougo/neoinclude.vim/,,
https://github.com/neomake/neomake/,,
https://github.com/Shougo/neomru.vim/,,
https://github.com/rafamadriz/neon/,,
https://github.com/ii14/neorepl.nvim/,HEAD,
https://github.com/nvim-neorg/neorg/,,
https://github.com/nvim-neorg/neorg-telescope/,HEAD,
https://github.com/karb94/neoscroll.nvim/,,
@ -580,6 +589,7 @@ https://github.com/kevinhwang91/nvim-hlslens/,,
https://github.com/neovimhaskell/nvim-hs.vim/,,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
https://github.com/ethanholz/nvim-lastplace/,HEAD,
https://github.com/kosayoda/nvim-lightbulb/,,
https://github.com/josa42/nvim-lightline-lsp/,,
@ -605,6 +615,7 @@ https://github.com/yorickpeterse/nvim-pqf/,HEAD,
https://github.com/olrtg/nvim-rename-state/,HEAD,
https://github.com/petertriho/nvim-scrollbar/,HEAD,
https://github.com/dstein64/nvim-scrollview/,,
https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
https://github.com/dcampos/nvim-snippy/,HEAD,
https://github.com/ishan9299/nvim-solarized-lua/,,
https://github.com/nvim-pack/nvim-spectre/,,
@ -620,11 +631,13 @@ https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
https://github.com/windwp/nvim-ts-autotag/,,
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
https://github.com/mrjones2014/nvim-ts-rainbow/,,
https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD,
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
https://github.com/samjwill/nvim-unception/,HEAD,
https://github.com/kyazdani42/nvim-web-devicons/,,
https://github.com/AckslD/nvim-whichkey-setup.lua/,,
https://github.com/roxma/nvim-yarp/,,
@ -661,6 +674,7 @@ https://github.com/andsild/peskcolor.vim/,,
https://github.com/pest-parser/pest.vim/,HEAD,
https://github.com/lifepillar/pgsql.vim/,,
https://github.com/motus/pig.vim/,,
https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
https://github.com/aklt/plantuml-syntax/,,
https://github.com/nvim-treesitter/playground/,,
https://github.com/nvim-lua/plenary.nvim/,,
@ -671,6 +685,7 @@ https://github.com/nvim-lua/popup.nvim/,,
https://github.com/andweeb/presence.nvim/,,
https://github.com/sotte/presenting.vim/,,
https://github.com/ewilazarus/preto/,HEAD,
https://github.com/anuvyklack/pretty-fold.nvim/,HEAD,
https://github.com/vim-scripts/prev_indent/,,
https://github.com/ahmedkhalf/project.nvim/,,
https://github.com/kevinhwang91/promise-async/,HEAD,

2
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -61,7 +61,7 @@ in
downloadPage = "https://github.com/VSCodium/vscodium/releases";
license = licenses.mit;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ synthetica turion bobby285271 ];
maintainers = with maintainers; [ synthetica bobby285271 ];
mainProgram = "codium";
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];
};

2
pkgs/applications/file-managers/krusader/default.nix
View File

@ -42,7 +42,7 @@ mkDerivation rec {
homepage = "http://www.krusader.org";
description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2Only;
maintainers = with maintainers; [ sander turion ];
maintainers = with maintainers; [ sander ];
mainProgram = "krusader";
};
}

6
pkgs/applications/file-managers/xplr/default.nix
View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.21.2";
version = "0.21.3";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MCOkl95X5YZTAC0VHtSY5xWf1R3987cxepSM7na+LdA=";
sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoHash = "sha256-1uAnIuxDDv3Z/fMs2Cu/aFWrnugGcEKlNjhILqDpOMI=";
cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI=";
checkFlags = [
# failure: path::tests::test_relative_to_parent

5
pkgs/applications/graphics/meme-image-generator/default.nix
View File

@ -11,16 +11,15 @@ buildGoModule rec {
owner = "nomad-software";
repo = "meme";
rev = "v${version}";
sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k";
hash = "sha256-MzSPJCszVEZkBvSbRzXR7AaDQOOjDQ2stKKJr8oGOSE=";
};
vendorSha256 = null;
vendorHash = null;
meta = with lib; {
description = "A command line utility for creating image macro style memes";
homepage = "https://github.com/nomad-software/meme";
license = licenses.mit;
maintainers = [ maintainers.fgaz ];
platforms = with platforms; linux ++ darwin;
};
}

7
pkgs/applications/graphics/pixinsight/default.nix
View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "pixinsight";
version = "1.8.9-1";
version = "1.8.9-2";
src = requireFile rec {
name = "PI-linux-x64-${version}-20220518-c.tar.xz";
name = "PI-linux-x64-${version}-20230814-c.tar.xz";
url = "https://pixinsight.com/";
sha256 = "sha256-AVeDJ7YYqCo7KfelUUQurjglNnTwCf0pOzJCV/bQrrw=";
sha256 = "sha256-4Jspkl5riMlbeJX/h1zhVfVymORPK1X4l0LyOgXm05Y=";
message = ''
PixInsight is available from ${url} and requires a commercial (or trial) license.
After a license has been obtained, PixInsight can be downloaded from the software distribution
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
libXext
libXfixes
libXrandr
libxkbfile
]);
postPatch = ''

2
pkgs/applications/kde/konsole.nix
View File

@ -13,7 +13,7 @@ mkDerivation {
homepage = "https://apps.kde.org/konsole/";
description = "KDE terminal emulator";
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
maintainers = with lib.maintainers; [ ttuegel turion ];
maintainers = with lib.maintainers; [ ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

4
pkgs/applications/kde/marble.nix
View File

@ -2,7 +2,7 @@
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebengine
, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl
, gpsd, perl, protobuf3_21
}:
mkDerivation {
@ -15,7 +15,7 @@ mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
protobuf3_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
preConfigure = ''

2
pkgs/applications/kde/okular.nix
View File

@ -35,7 +35,7 @@ mkDerivation {
homepage = "http://www.kde.org";
description = "KDE document viewer";
license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ];
maintainers = with maintainers; [ ttuegel turion ];
maintainers = with maintainers; [ ttuegel ];
platforms = lib.platforms.linux;
};
}

3
pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
View File

@ -23,7 +23,8 @@ index 5dc25e0..b3ba397 100644
@@ -33,4 +33,4 @@ skip-string-normalization = true
[build-system]
requires = ["poetry>=0.12"]
-requires = ["poetry>=0.12"]
+requires = ["poetry-core"]
-build-backend = "poetry.masonry.api"
+build-backend = "poetry.core.masonry.api"
--

9
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
{ lib, fetchFromGitHub, stdenv, shortenPerlShebang, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
perlPackages.buildPerlPackage rec {
pname = "get_iplayer";
@ -12,7 +12,7 @@ perlPackages.buildPerlPackage rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ];
buildInputs = [ perl ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
propagatedBuildInputs = with perlPackages; [
HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious
];
@ -27,13 +27,16 @@ perlPackages.buildPerlPackage rec {
wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
'';
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/.get_iplayer-wrapped
'';
meta = with lib; {
description = "Downloads TV and radio from BBC iPlayer";
license = licenses.gpl3Plus;
homepage = "https://squarepenguin.co.uk/";
platforms = platforms.all;
maintainers = with maintainers; [ rika ];
maintainers = with maintainers; [ rika jgarcia ];
};
}

4
pkgs/applications/misc/jetbrains-toolbox/default.nix
View File

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "2.0.1.16621";
version = "2.0.2.16660";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-FZuoLzouwi3HfTJct+Sh8DNzdzQoEsErBb04SgYrZN0=";
sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM=";
stripRoot = false;
};

2
pkgs/applications/misc/keepassxc/default.nix
View File

@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://keepassxc.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato turion srapenne ];
maintainers = with maintainers; [ jonafato srapenne ];
platforms = platforms.linux ++ platforms.darwin;
};
}

4
pkgs/applications/misc/logseq/default.nix
View File

@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
in {
pname = "logseq";
version = "0.9.13";
version = "0.9.14";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-fDE19E8FhyXG9RMbfKNCQrhMW5CzQPAp+zRSu4EQMt4=";
hash = "sha256-UFl+AqfG0OzT+lHC6Sq+gUQTyvzUQP6Enh+rLSq3Xhc=";
name = "${pname}-${version}.AppImage";
};

12
pkgs/applications/misc/nwg-panel/default.nix
View File

@ -10,17 +10,18 @@
, pamixer # pamixer
, pulseaudio # pactl
, libdbusmenu-gtk3 # tray
, playerctl
}:
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.7.17";
version = "0.9.11";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM=";
rev = "v${version}";
hash = "sha256-4/R/x3iQ6nsG5OLy/FMA24uxS3xKD/2901gBNe6lkk4=";
};
# No tests
@ -30,7 +31,7 @@ python3Packages.buildPythonApplication rec {
strictDeps = false;
dontWrapGApps = true;
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ];
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ];
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
propagatedBuildInputs = (with python3Packages;
[ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ])
@ -56,6 +57,7 @@ python3Packages.buildPythonApplication rec {
description = "GTK3-based panel for Sway window manager";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ ludovicopiero ];
mainProgram = "nwg-panel";
};
}

17
pkgs/applications/misc/onthespot/default.nix
View File

@ -1,9 +1,9 @@
{ lib
, python3
, fetchFromGitHub
, copyDesktopItems
, wrapQtAppsHook
, fetchFromGitHub
, makeDesktopItem
, python3
, wrapQtAppsHook
}:
python3.pkgs.buildPythonApplication rec {
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "casualsnek";
repo = "onthespot";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
};
@ -54,11 +54,12 @@ python3.pkgs.buildPythonApplication rec {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = {
meta = with lib; {
description = " QT based Spotify music downloader written in Python";
homepage = "https://github.com/casualsnek/onthespot";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ onny ];
platforms = lib.platforms.linux;
changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ onny ];
platforms = platforms.linux;
};
}

19
pkgs/applications/misc/oranda/default.nix
View File

@ -5,20 +5,28 @@
, oniguruma
, stdenv
, darwin
, tailwindcss
}:
rustPlatform.buildRustPackage rec {
pname = "oranda";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "oranda";
rev = "v${version}";
hash = "sha256-1pkAIz6Zh0ArIDmRSLHTnIgySWdxrDx0amTkdZhY6vY=";
hash = "sha256-R9b2T/Em3s4hwcXa3l2i8A3w/aBu0Dz+izFcE4Q8J/4=";
};
cargoHash = "sha256-TKpPAzqwWBH2dlBNvU2kuqqOVu5WhSnSR3wW5FsW7yk=";
cargoHash = "sha256-0eH7LZfO5/YgXP9Hom7pgALKFksSTAiczgT7rrNnqow=";
patches = [
# oranda-generate-css which is used in the build script tries to download
# tailwindcss from the internet, so we have to patch it to use the
# tailwindcss from nixpkgs
./tailwind.patch
];
nativeBuildInputs = [
pkg-config
@ -33,10 +41,15 @@ rustPlatform.buildRustPackage rec {
# requires internet access
checkFlags = [
"--skip=build"
"--skip=integration"
];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
TAILWINDCSS = lib.getExe tailwindcss;
} // lib.optionalAttrs stdenv.isDarwin {
# without this, tailwindcss fails with OpenSSL configuration error
OPENSSL_CONF = "";
};
meta = with lib; {

52
pkgs/applications/misc/oranda/tailwind.patch Normal file
View File

@ -0,0 +1,52 @@
--- a/generate-css/src/lib.rs
+++ b/generate-css/src/lib.rs
@@ -28,48 +28,7 @@ pub fn default_css_output_dir() -> Utf8PathBuf {
}
pub fn build_css(dist_dir: &Utf8Path) -> Result<()> {
- // Fetch our cache dir
- let project_dir = ProjectDirs::from("dev", "axo", "oranda")
- .expect("Unable to create cache dir for downloading Tailwind!");
- let cache_dir = project_dir.cache_dir();
- // Figure out our target "double" (tailwind has weird naming around this)
- let double = match (env::consts::OS, env::consts::ARCH) {
- ("linux", "x86_64") => "linux-x64",
- ("linux", "aarch64") => "linux-arm64",
- ("linux", "arm") => "linux-armv7",
- ("macos", "x86_64") => "macos-x64",
- ("macos", "aarch64") => "macos-arm64",
- ("windows", "x86_64") => "windows-x64.exe",
- ("windows", "aarch64") => "windows-arm64.exe",
- _ => "linux-x64",
- };
- let mut binary_path = Utf8PathBuf::from(cache_dir.display().to_string());
- LocalAsset::create_dir_all(&binary_path)?;
- binary_path.push(format!("tailwindcss-{double}"));
- if !binary_path.exists() {
- // Fetch the binary from GitHub if it doesn't exist
- tracing::info!("Fetching Tailwind binary from GitHub release...");
- let url = format!(
- "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-{double}"
- );
- let handle = tokio::runtime::Handle::current();
- let response = handle.block_on(reqwest::get(url))?;
- let bytes = handle.block_on(response.bytes())?;
- let file = LocalAsset::new(&binary_path, Vec::from(bytes))?;
- file.write(
- binary_path
- .parent()
- .expect("Tailwind binary path has no parent!?"),
- )?;
-
- // On non-Windows platforms, we need to mark the file as executable
- #[cfg(target_family = "unix")]
- {
- use std::os::unix::prelude::PermissionsExt;
- let user_execute = std::fs::Permissions::from_mode(0o755);
- std::fs::set_permissions(&binary_path, user_execute)?;
- }
- }
+ let binary_path = env!("TAILWINDCSS");
tracing::info!("Building oranda CSS using Tailwind...");
let css_src_path = manifest_dir().join(CSS_SRC_PATH);

19
pkgs/applications/misc/pyditz/cerberus.nix
View File

@ -1,19 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }:
buildPythonPackage rec {
pname = "Cerberus";
version = "1.1";
src = fetchPypi {
inherit pname version;
sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5";
};
nativeCheckInputs = [ pytest-runner pytest ];
meta = with lib; {
homepage = "http://python-cerberus.org/";
description = "Lightweight, extensible schema and data validation tool for Python dictionaries";
license = licenses.mit;
};
}

10
pkgs/applications/misc/pyditz/default.nix
View File

@ -2,23 +2,21 @@
with pythonPackages;
let
cerberus_1_1 = callPackage ./cerberus.nix { };
in buildPythonApplication rec {
buildPythonApplication rec {
pname = "pyditz";
version = "0.11";
src = fetchPypi {
inherit pname version;
sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551";
hash = "sha256-2gNlrpBk4wxKJ1JvsNeoAv2lyGUc2mmQ0Xvn7eiaJVE=";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];
propagatedBuildInputs = [ pyyaml six jinja2 cerberus ];
nativeCheckInputs = [ unittestCheckHook ];
meta = with lib; {
homepage = "https://pythonhosted.org/pyditz/";
homepage = "https://pypi.org/project/pyditz/";
description = "Drop-in replacement for the Ditz distributed issue tracker";
maintainers = [ maintainers.ilikeavocadoes ];
license = licenses.lgpl2;

4
pkgs/applications/misc/remnote/default.nix
View File

@ -2,11 +2,11 @@
appimageTools.wrapType2 rec {
pname = "remnote";
version = "1.12.3";
version = "1.12.9";
src = fetchurl {
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
sha256 = "sha256-qLEEIzTE5h9+9tWL0qSFCqN/MW124NtIacqiKnhlbp8=";
sha256 = "sha256-ZBo7yxbTS+2pWecbPGxp0UMy16HRMwuuUUejb6DUHic=";
};
meta = with lib; {

1
pkgs/applications/misc/seatd/default.nix
View File

@ -47,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ emantor ];
platforms = with lib.platforms; freebsd ++ linux ++ netbsd;
mainProgram = "seatd";
};
})

1
pkgs/applications/misc/tofi/default.nix
View File

@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ fbergroth ];
platforms = platforms.linux;
mainProgram = "tofi";
};
}

6
pkgs/applications/misc/tui-journal/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-4fa41kzDGefqxfCcxe1/9iEZHVC8MIzcOG8RUiLW5bw=";
hash = "sha256-DKactqPyZTDmD4F15wKHvwuzsZUj6y1MJuPyASnia/c=";
};
cargoHash = "sha256-Uz9Od9hXM6EGZ+MsZ7uCYvA4aoF3E9uSNjjtxd1ssCs=";
cargoHash = "sha256-dLyI2cmIz1ucKdhAEs3Nz1tamcJUDZtdv4Fk/Wo+Zxs=";
nativeBuildInputs = [
pkg-config

8
pkgs/applications/misc/wallust/default.nix
View File

@ -4,23 +4,23 @@
}:
rustPlatform.buildRustPackage rec {
pname = "wallust";
version = "2.5.1";
version = "2.6.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "explosion-mental";
repo = pname;
rev = version;
hash = "sha256-v72ddWKK2TMHKeBihYjMoJvKXiPe/yqJtdh8VQzjmVU=";
hash = "sha256-xcsOOA6esvIhzeka8E9OvCT8aXMWWSHO4lNLtaocTSo=";
};
cargoSha256 = "sha256-jDs4KeVN3P+4/T1cW4KDxoY79jE3GXiwzxLrR2HybWw=";
cargoSha256 = "sha256-YDIBn2fjlvNTYwMVn/MkID/EMmzz4oLieVgG2R95q4M=";
meta = with lib; {
description = "A better pywal";
homepage = "https://codeberg.org/explosion-mental/wallust";
license = licenses.mit;
maintainers = with maintainers; [ onemoresuza ];
maintainers = with maintainers; [onemoresuza iynaix];
downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}";
platforms = platforms.unix;
mainProgram = "wallust";

3
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -361,7 +361,6 @@ let
# Optional features:
use_gio = true;
use_gnome_keyring = false; # Superseded by libsecret
use_cups = cupsSupport;
# Feature overrides:
@ -384,6 +383,8 @@ let
# We do intentionally not set rustc_version as nixpkgs will never do incremental
# rebuilds, thus leaving this empty is fine.
rust_sysroot_absolute = "${rustc}";
# Building with rust is disabled for now - this matches the flags in other major distributions.
enable_rust = false;
} // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {
# https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html
arm_control_flow_integrity = "none";

33
pkgs/applications/networking/browsers/chromium/update.py
View File

@ -63,21 +63,26 @@ def get_file_revision(revision, file_path):
return base64.b64decode(resp)
def get_matching_chromedriver(version):
"""Gets the matching chromedriver version for the given Chromium version."""
# See https://chromedriver.chromium.org/downloads/version-selection
build = re.sub('.[0-9]+$', '', version)
chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}'
with urlopen(chromedriver_version_url) as http_response:
chromedriver_version = http_response.read().decode()
def get_chromedriver_url(system):
return ('https://chromedriver.storage.googleapis.com/' +
f'{chromedriver_version}/chromedriver_{system}.zip')
def get_chromedriver(channel):
"""Get the latest chromedriver builds given a channel"""
# See https://chromedriver.chromium.org/downloads/version-selection#h.4wiyvw42q63v
chromedriver_versions_url = f'https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json'
print(f'GET {chromedriver_versions_url}')
with urlopen(chromedriver_versions_url) as http_response:
chromedrivers = json.load(http_response)
channel = chromedrivers['channels'][channel]
downloads = channel['downloads']['chromedriver']
def get_chromedriver_url(platform):
for download in downloads:
if download['platform'] == platform:
return download['url']
return {
'version': chromedriver_version,
'version': channel['version'],
'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')),
'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac_arm64'))
'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')),
'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64'))
}
@ -212,7 +217,7 @@ with urlopen(RELEASES_URL) as resp:
channel['deps'] = get_channel_dependencies(channel['version'])
if channel_name == 'stable':
channel['chromedriver'] = get_matching_chromedriver(channel['version'])
channel['chromedriver'] = get_chromedriver('Stable')
elif channel_name == 'ungoogled-chromium':
ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git'
channel['deps']['ungoogled-patches'] = {

28
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -35,31 +35,31 @@
};
deps = {
gn = {
rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
url = "https://gn.googlesource.com/gn";
version = "2023-05-19";
version = "2023-06-09";
};
};
sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z";
sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9";
version = "115.0.5790.170";
sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y";
sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl";
version = "116.0.5845.96";
};
ungoogled-chromium = {
deps = {
gn = {
rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
url = "https://gn.googlesource.com/gn";
version = "2023-05-19";
version = "2023-06-09";
};
ungoogled-patches = {
rev = "115.0.5790.170-1";
sha256 = "0vk82jacadb4id16596s4751j4idq6903w6sl2s7cj4ppxd6pyf1";
rev = "116.0.5845.96-1";
sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr";
};
};
sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z";
sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9";
version = "115.0.5790.170";
sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y";
sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl";
version = "116.0.5845.96";
};
}

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "116.0.2";
version = "116.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d";
sha512 = "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9";
};
meta = {

4
pkgs/applications/networking/cluster/hetzner-kube/default.nix
View File

@ -8,7 +8,7 @@ buildGoModule rec {
owner = "xetys";
repo = "hetzner-kube";
rev = version;
sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw";
hash = "sha256-XHvR+31yq0o3txMBHh2rCh2peDlG5Kh3hdl0LGm9D8c=";
};
patches = [
@ -18,7 +18,7 @@ buildGoModule rec {
./fix-home.patch
];
vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h";
vendorHash = "sha256-sIjSu9U+uNc5dgt9Qg328W/28nX4F5d5zjUb7Y1xAso=";
doCheck = false;

4
pkgs/applications/networking/cluster/k3d/default.nix
View File

@ -15,13 +15,13 @@ let
in
buildGoModule rec {
pname = "k3d";
version = "5.5.1";
version = "5.5.2";
src = fetchFromGitHub {
owner = "k3d-io";
repo = "k3d";
rev = "refs/tags/v${version}";
hash = "sha256-cXUuWR5ALgCgr1bK/Qpdpo978p3PRL3/H6j1T7DKrT4=";
hash = "sha256-Pa2kqeVl+TEsHOpnE7+iG3feYVAuYrDYnWyDpWJay7M=";
};
vendorHash = null;

6
pkgs/applications/networking/cluster/linkerd/edge.nix
View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "23.8.1";
sha256 = "0ajcxfqbaimrj8ylbk3s2djv2jpczm4c6z39b4fdak68sylmvb9z";
vendorSha256 = "sha256-sj3KJLPO4pxnGov2Oiqj1FgAQ2atf3FJPINmeKjPUZQ=";
version = "23.8.2";
sha256 = "18lz817d1jjl8ynkdhvm32p8ja9bkh1xqkpi514cws27y3zcirrz";
vendorSha256 = "sha256-SIyS01EGpb3yzw3NIBAO47ixAiWPX2F+9ANoeCTkbRg=";
}

44
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-ajASdZaw61sDn5JsxLhvY0kI14KBF07Uc1GiRrQ7f8c=",
"hash": "sha256-eUvN+b7rj1l20/RHo+zFz2rxpZM4QlXBlag/Nfnt7ps=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.12.0",
"rev": "v5.13.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-hDiazrFZDqBn4ErjYGZamjHMuQ3ImZu3eSeXKImm9Ww="
"vendorHash": "sha256-w+p37Ayw/wsv6k5Bk6SWwiVdyJtH1z6mx6hM301Dnyw="
},
"azuread": {
"hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-6a6JXzTpXRIscWf1sSZwubnDww1KTFrDnGNO7+aqjoY=",
"hash": "sha256-Nw0Ep5YbipmupB53uzZHHogseHFAbvurz42Q4fPNw/o=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.69.0",
"rev": "v3.70.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -146,11 +146,11 @@
"vendorHash": null
},
"baiducloud": {
"hash": "sha256-exVqL9iUP27PwLGxncFCnnhFnnVWd6KcPqv412W9YMA=",
"hash": "sha256-NW3q+1132gBlyFDsqZyHoZzhljF+T9ZmVMfy8B4BsuQ=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.11",
"rev": "v1.19.12",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -556,11 +556,11 @@
"vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4="
},
"huaweicloud": {
"hash": "sha256-zfYIhROmNEXUmO52zs1u6X4WXFtE+duuiS6wlSBLygw=",
"hash": "sha256-ogxzt57zD122xJv0qpHVyUzhHrH8U1RHfJihTLUcBbI=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.54.0",
"rev": "v1.54.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -655,11 +655,11 @@
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
},
"kubernetes": {
"hash": "sha256-J3+F6GJJjGzWBwqnznI/If6I0sZ733h6ShR2EdbqPVs=",
"hash": "sha256-aPplKT6L9Lmp4St6DLtHywiunqLaABEB9urbtSfK8Ec=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
"rev": "v2.22.0",
"rev": "v2.23.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
@ -682,13 +682,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",
"hash": "sha256-tSbrd+T1HOOpO4atNDcYmq0SkEureSJkjWOnxqOTdnM=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.5.2",
"rev": "v2.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="
"vendorHash": "sha256-dIxOvx8UpZD5I7acucxzfnq+gyDX+uqVMJRkqH5jTRI="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@ -827,11 +827,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-dB8yoUPv6uYKveZxCblwif2FKW0qNdY5CJMpbZivB78=",
"hash": "sha256-sxhykS4pXF00VJVtVd7kO2GasAqBUUMqPDPLE3BzUFI=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.8.0",
"rev": "v5.9.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1106,13 +1106,13 @@
"vendorHash": "sha256-6UxBnQiogcizff5Rv4eadOeiG5JaXQphUWlfnqELvAI="
},
"talos": {
"hash": "sha256-OGpbql9jtiaaHazyBavh1NK5cBA+2tfxZvOJV+yy2wE=",
"hash": "sha256-GRwzR2L6PKx6Us1ci3cs2+DU7TQvhEPcOLyn73dS96Y=",
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
"owner": "siderolabs",
"repo": "terraform-provider-talos",
"rev": "v0.2.1",
"rev": "v0.3.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-32ENfzBep97Wn0FvMIEuqxIAmxjTtw2UvDvYJTmJJNc="
"vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc="
},
"tencentcloud": {
"hash": "sha256-T98RZ775nXIjqanqWhZfz+IKJIXvDEkVnqHhznilYe0=",
@ -1270,12 +1270,12 @@
"vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q="
},
"yandex": {
"hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=",
"hash": "sha256-Y4bEbqUTxP1QDf1r8a3vtxV+RG3dqjHxHN9p/nB3qz8=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.96.1",
"rev": "v0.97.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg="
"vendorHash": "sha256-1Sw4a9HFYt24Om5Bbbmx6JskhbMd4zTv6K6WOrQetpQ="
}
}

46
pkgs/applications/networking/gns3/default.nix
View File

@ -3,44 +3,34 @@
}:
let
stableVersion = "2.2.35.1";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
extraArgs = rec {
mkOverride = attrname: version: sha256:
self: super: {
"${attrname}" = super."${attrname}".overridePythonAttrs (oldAttrs: {
inherit version;
src = oldAttrs.src.override {
inherit version sha256;
};
});
};
mkGui = args: callPackage (import ./gui.nix (args)) {
inherit (libsForQt5) wrapQtAppsHook;
};
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "sha256-iVvADwIp01HeZoDayvH1dilYRHRkRBTBR3Fh395JBq0=";
serverSrcHash = "sha256-41dbiSjvmsDNYr9/rRkeQVOnPSVND34xx1SNknCgHfc=";
mkServer = args: callPackage (import ./server.nix (args)) { };
in {
guiStable = mkGui {
stable = true;
sha256Hash = guiSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
};
guiPreview = mkGui {
stable = false;
sha256Hash = guiSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
};
serverStable = mkServer {
stable = true;
sha256Hash = serverSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
};
serverPreview = mkServer {
stable = false;
sha256Hash = serverSrcHash;
channel = "stable";
version = "2.2.42";
hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
};
}

32
pkgs/applications/networking/gns3/gui.nix
View File

@ -1,8 +1,6 @@
{ stable
, branch
{ channel
, version
, sha256Hash
, mkOverride
, hash
}:
{ lib
@ -11,18 +9,19 @@
, wrapQtAppsHook
}:
python3.pkgs.buildPythonPackage rec {
python3.pkgs.buildPythonApplication rec {
pname = "gns3-gui";
inherit version;
src = fetchFromGitHub {
inherit hash;
owner = "GNS3";
repo = pname;
rev = "v${version}";
sha256 = sha256Hash;
};
nativeBuildInputs = [
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
wrapQtAppsHook
];
@ -33,25 +32,24 @@ python3.pkgs.buildPythonPackage rec {
sentry-sdk
setuptools
sip_4 (pyqt5.override { withWebSockets = true; })
truststore
];
pythonRelaxDeps = [
"jsonschema"
"sentry-sdk"
];
doCheck = false; # Failing
dontWrapQtApps = true;
postFixup = ''
wrapQtApp "$out/bin/gns3"
'';
postPatch = ''
substituteInPlace requirements.txt \
--replace "psutil==" "psutil>=" \
--replace "jsonschema>=4.17.0,<4.18" "jsonschema" \
--replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk"
preFixup = ''
wrapQtApp "$out/bin/gns3"
'';
meta = with lib; {
description = "Graphical Network Simulator 3 GUI (${branch} release)";
description = "Graphical Network Simulator 3 GUI (${channel} release)";
longDescription = ''
Graphical user interface for controlling the GNS3 network simulator. This
requires access to a local or remote GNS3 server (it's recommended to

26
pkgs/applications/networking/gns3/server.nix
View File

@ -1,13 +1,12 @@
{ stable
, branch
{ channel
, version
, sha256Hash
, mkOverride
, hash
}:
{ lib
, python3
, fetchFromGitHub
, pkgsStatic
}:
python3.pkgs.buildPythonApplication {
@ -15,23 +14,25 @@ python3.pkgs.buildPythonApplication {
inherit version;
src = fetchFromGitHub {
inherit hash;
owner = "GNS3";
repo = "gns3-server";
rev = "refs/tags/v${version}";
sha256 = sha256Hash;
};
pythonRelaxDeps = [
"aiofiles"
"jsonschema"
"psutil"
"sentry-sdk"
];
# GNS3 2.3.26 requires a static BusyBox for the Docker integration
prePatch = ''
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
'';
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"jsonschema"
];
propagatedBuildInputs = with python3.pkgs; [
aiofiles
aiohttp
@ -47,6 +48,7 @@ python3.pkgs.buildPythonApplication {
py-cpuinfo
sentry-sdk
setuptools
truststore
yarl
zipstream
];
@ -59,7 +61,7 @@ python3.pkgs.buildPythonApplication {
'';
meta = with lib; {
description = "Graphical Network Simulator 3 server (${branch} release)";
description = "Graphical Network Simulator 3 server (${channel} release)";
longDescription = ''
The GNS3 server manages emulators such as Dynamips, VirtualBox or
Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST

1799
pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/networking/instant-messengers/fractal-next/default.nix
View File

@ -26,23 +26,23 @@
stdenv.mkDerivation rec {
pname = "fractal-next";
version = "5.beta1";
version = "5.beta2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = version;
hash = "sha256-i1kz7k2BBsSmZXUk6U2eT+08T2l950eFd67Cojtd1/k=";
hash = "sha256-/BO+TlhLhi7BGsHq8aOpYw8AqNrJT0IJZOc1diq2Rys=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"matrix-sdk-0.6.2" = "sha256-27FYmqkzqh1wI6B2BI8LM4DoMfymyJdOn5OGsJZjBAc=";
"ruma-0.8.2" = "sha256-Qsk8KVY5ix7nlDG+1246vQ5HZxgmJmm3KU+RknUFFGg=";
"vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE=";
"x25519-dalek-1.2.0" = "sha256-AHjhccCqacu0WMTFyxIret7ghJ2V+8wEAwR5L6Hy1KY=";
"matrix-sdk-0.6.2" = "sha256-A1oKNbEx2A6WwvYcNSW53Fd6QWwr0QFJtrsJXO2KInE=";
"ruma-0.8.2" = "sha256-kCGS7ACFGgmtTUElLJQMYfjwJ3glF7bRPZYJIFcuPtc=";
"curve25519-dalek-4.0.0" = "sha256-sxEFR6lsX7t4u/fhWd6wFMYETI2egPUbjMeBWkB289E=";
"vodozemac-0.4.0" = "sha256-TCbWJ9bj/FV3ILWUTcksazel8ESTNTiDGL7kGlEGvow=";
};
};

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -23,12 +23,12 @@ assert gpgmeSupport -> sslSupport;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.10";
version = "2.2.11";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg=";
hash = "sha256-EjJc9m1f+KxL2H+sjbUshp3lLdJ4/DAc/VfVofn0Zcw=";
};
patches = [

Some files were not shown because too many files have changed in this diff Show More