ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-21 00:05:50 +00:00 committed by GitHub
commit c434165354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 2479 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
lib/ascii-table.nix Normal file
View File

@ -0,0 +1,96 @@
{ " " = 32;
"!" = 33;
"\"" = 34;
"#" = 35;
"$" = 36;
"%" = 37;
"&" = 38;
"'" = 39;
"(" = 40;
")" = 41;
"*" = 42;
"+" = 43;
"," = 44;
"-" = 45;
"." = 46;
"/" = 47;
"0" = 48;
"1" = 49;
"2" = 50;
"3" = 51;
"4" = 52;
"5" = 53;
"6" = 54;
"7" = 55;
"8" = 56;
"9" = 57;
":" = 58;
";" = 59;
"<" = 60;
"=" = 61;
">" = 62;
"?" = 63;
"@" = 64;
"A" = 65;
"B" = 66;
"C" = 67;
"D" = 68;
"E" = 69;
"F" = 70;
"G" = 71;
"H" = 72;
"I" = 73;
"J" = 74;
"K" = 75;
"L" = 76;
"M" = 77;
"N" = 78;
"O" = 79;
"P" = 80;
"Q" = 81;
"R" = 82;
"S" = 83;
"T" = 84;
"U" = 85;
"V" = 86;
"W" = 87;
"X" = 88;
"Y" = 89;
"Z" = 90;
"[" = 91;
"\\" = 92;
"]" = 93;
"^" = 94;
"_" = 95;
"`" = 96;
"a" = 97;
"b" = 98;
"c" = 99;
"d" = 100;
"e" = 101;
"f" = 102;
"g" = 103;
"h" = 104;
"i" = 105;
"j" = 106;
"k" = 107;
"l" = 108;
"m" = 109;
"n" = 110;
"o" = 111;
"p" = 112;
"q" = 113;
"r" = 114;
"s" = 115;
"t" = 116;
"u" = 117;
"v" = 118;
"w" = 119;
"x" = 120;
"y" = 121;
"z" = 122;
"{" = 123;
"|" = 124;
"}" = 125;
"~" = 126;
}

38
lib/strings.nix
View File

@ -185,6 +185,16 @@ rec {
*/
makeBinPath = makeSearchPathOutput "bin" "bin";
/* Normalize path, removing extranous /s
Type: normalizePath :: string -> string
Example:
normalizePath "/a//b///c/"
=> "/a/b/c/"
*/
normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (splitString "" s));
/* Depending on the boolean `cond', return either the given string
or the empty string. Useful to concatenate against a bigger string.
@ -294,6 +304,21 @@ rec {
map f (stringToCharacters s)
);
/* Convert char to ascii value, must be in printable range
Type: charToInt :: string -> int
Example:
charToInt "A"
=> 65
charToInt "("
=> 40
*/
charToInt = let
table = import ./ascii-table.nix;
in c: builtins.getAttr c table;
/* Escape occurrence of the elements of `list` in `string` by
prefixing it with a backslash.
@ -305,6 +330,19 @@ rec {
*/
escape = list: replaceChars list (map (c: "\\${c}") list);
/* Escape occurence of the element of `list` in `string` by
converting to its ASCII value and prefixing it with \\x.
Only works for printable ascii characters.
Type: escapeC = [string] -> string -> string
Example:
escapeC [" "] "foo bar"
=> "foo\\x20bar"
*/
escapeC = list: replaceChars list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
/* Quote string to be used safely within the Bourne shell.
Type: escapeShellArg :: string -> string

15
lib/tests/misc.nix
View File

@ -312,6 +312,21 @@ runTests {
expected = true;
};
testNormalizePath = {
expr = strings.normalizePath "//a/b//c////d/";
expected = "/a/b/c/d/";
};
testCharToInt = {
expr = strings.charToInt "A";
expected = 65;
};
testEscapeC = {
expr = strings.escapeC [ " " ] "Hello World";
expected = "Hello\\x20World";
};
# LISTS
testFilter = {

7
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -309,6 +309,13 @@
<link linkend="opt-services.outline.enable">services.outline</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://ntfy.sh">ntfy.sh</link>, a push
notification service. Available as
<link linkend="opt-services.ntfy-sh.enable">services.ntfy-sh</link>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://git.sr.ht/~migadu/alps">alps</link>,

2
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -112,6 +112,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
- [ntfy.sh](https://ntfy.sh), a push notification service. Available as [services.ntfy-sh](#opt-services.ntfy-sh.enable)
- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable).
- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable).

18
nixos/lib/utils.nix
View File

@ -39,11 +39,19 @@ rec {
|| hasPrefix a'.mountPoint b'.mountPoint
|| any (hasPrefix a'.mountPoint) b'.depends;
# Escape a path according to the systemd rules, e.g. /dev/xyzzy
# becomes dev-xyzzy. FIXME: slow.
escapeSystemdPath = s:
replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
(removePrefix "/" s);
# Escape a path according to the systemd rules. FIXME: slow
# The rules are described in systemd.unit(5) as follows:
# The escaping algorithm operates as follows: given a string, any "/" character is replaced by "-", and all other characters which are not ASCII alphanumerics, ":", "_" or "." are replaced by C-style "\x2d" escapes. In addition, "." is replaced with such a C-style escape when it would appear as the first character in the escaped string.
# When the input qualifies as absolute file system path, this algorithm is extended slightly: the path to the root directory "/" is encoded as single dash "-". In addition, any leading, trailing or duplicate "/" characters are removed from the string before transformation. Example: /foo//bar/baz/ becomes "foo-bar-baz".
escapeSystemdPath = s: let
replacePrefix = p: r: s: (if (hasPrefix p s) then r + (removePrefix p s) else s);
trim = s: removeSuffix "/" (removePrefix "/" s);
normalizedPath = strings.normalizePath s;
in
replaceChars ["/"] ["-"]
(replacePrefix "." (strings.escapeC ["."] ".")
(strings.escapeC (stringToCharacters " !\"#$%&'()*+,;<=>=@[\\]^`{|}~-")
(if normalizedPath == "/" then normalizedPath else trim normalizedPath)));
# Quotes an argument for use in Exec* service lines.
# systemd accepts "-quoted strings with escape sequences, toJSON produces

2
nixos/modules/module-list.nix
View File

@ -613,6 +613,7 @@
./services/misc/nix-optimise.nix
./services/misc/nix-ssh-serve.nix
./services/misc/novacomd.nix
./services/misc/ntfy-sh.nix
./services/misc/nzbget.nix
./services/misc/nzbhydra2.nix
./services/misc/octoprint.nix
@ -1072,6 +1073,7 @@
./services/web-apps/calibre-web.nix
./services/web-apps/code-server.nix
./services/web-apps/baget.nix
./services/web-apps/changedetection-io.nix
./services/web-apps/convos.nix
./services/web-apps/dex.nix
./services/web-apps/discourse.nix

100
nixos/modules/services/misc/ntfy-sh.nix Normal file
View File

@ -0,0 +1,100 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.ntfy-sh;
settingsFormat = pkgs.formats.yaml { };
in
{
options.services.ntfy-sh = {
enable = mkEnableOption (mdDoc "[ntfy-sh](https://ntfy.sh), a push notification service");
package = mkOption {
type = types.package;
default = pkgs.ntfy-sh;
defaultText = literalExpression "pkgs.ntfy-sh";
description = mdDoc "The ntfy.sh package to use.";
};
user = mkOption {
default = "ntfy-sh";
type = types.str;
description = lib.mdDoc "User the ntfy-sh server runs under.";
};
group = mkOption {
default = "ntfy-sh";
type = types.str;
description = lib.mdDoc "Primary group of ntfy-sh user.";
};
settings = mkOption {
type = types.submodule { freeformType = settingsFormat.type; };
default = { };
example = literalExpression ''
{
listen-http = ":8080";
}
'';
description = mdDoc ''
Configuration for ntfy.sh, supported values are [here](https://ntfy.sh/docs/config/#config-options).
'';
};
};
config =
let
configuration = settingsFormat.generate "server.yml" cfg.settings;
in
mkIf cfg.enable {
# to configure access control via the cli
environment = {
etc."ntfy/server.yml".source = configuration;
systemPackages = [ cfg.package ];
};
systemd.services.ntfy-sh = {
description = "Push notifications server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/ntfy serve -c ${configuration}";
User = cfg.user;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
PrivateTmp = true;
NoNewPrivileges = true;
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
ProtectSystem = "full";
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
PrivateDevices = true;
RestrictSUIDSGID = true;
RestrictNamespaces = true;
RestrictRealtime = true;
MemoryDenyWriteExecute = true;
};
};
users.groups = optionalAttrs (cfg.group == "ntfy-sh") {
ntfy-sh = { };
};
users.users = optionalAttrs (cfg.user == "ntfy-sh") {
ntfy-sh = {
isSystemUser = true;
group = cfg.group;
};
};
};
}

218
nixos/modules/services/web-apps/changedetection-io.nix Normal file
View File

@ -0,0 +1,218 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.changedetection-io;
in
{
options.services.changedetection-io = {
enable = mkEnableOption (lib.mdDoc "changedetection-io");
user = mkOption {
default = "changedetection-io";
type = types.str;
description = lib.mdDoc ''
User account under which changedetection-io runs.
'';
};
group = mkOption {
default = "changedetection-io";
type = types.str;
description = lib.mdDoc ''
Group account under which changedetection-io runs.
'';
};
listenAddress = mkOption {
type = types.str;
default = "localhost";
description = lib.mdDoc "Address the server will listen on.";
};
port = mkOption {
type = types.port;
default = 5000;
description = lib.mdDoc "Port the server will listen on.";
};
datastorePath = mkOption {
type = types.str;
default = "/var/lib/changedetection-io";
description = lib.mdDoc ''
The directory used to store all data for changedetection-io.
'';
};
baseURL = mkOption {
type = types.nullOr types.str;
default = null;
example = "https://changedetection-io.example";
description = lib.mdDoc ''
The base url used in notifications and `{base_url}` token.
'';
};
behindProxy = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable this option when changedetection-io runs behind a reverse proxy, so that it trusts X-* headers.
It is recommend to run changedetection-io behind a TLS reverse proxy.
'';
};
environmentFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/secrets/changedetection-io.env";
description = lib.mdDoc ''
Securely pass environment variabels to changedetection-io.
This can be used to set for example a frontend password reproducible via `SALTED_PASS`
which convinetly also deactivates nags about the hosted version.
`SALTED_PASS` should be 64 characters long while the first 32 are the salt and the second the frontend password.
It can easily be retrieved from the settings file when first set via the frontend with the following command:
``jq -r .settings.application.password /var/lib/changedetection-io/url-watches.json``
'';
};
webDriverSupport = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable support for fetching web pages using WebDriver and Chromium.
This starts a headless chromium controlled by puppeteer in an oci container.
::: {.note}
Playwright can currently leak memory.
See https://github.com/dgtlmoon/changedetection.io/wiki/Playwright-content-fetcher#playwright-memory-leak
:::
'';
};
playwrightSupport = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enable support for fetching web pages using playwright and Chromium.
This starts a headless Chromium controlled by puppeteer in an oci container.
::: {.note}
Playwright can currently leak memory.
See https://github.com/dgtlmoon/changedetection.io/wiki/Playwright-content-fetcher#playwright-memory-leak
:::
'';
};
chromePort = mkOption {
type = types.port;
default = 4444;
description = lib.mdDoc ''
A free port on which webDriverSupport or playwrightSupport listen on localhost.
'';
};
};
config = mkIf cfg.enable {
assertions = [
{
assertion = !((cfg.webDriverSupport == true) && (cfg.playwrightSupport == true));
message = "'services.changedetection-io.webDriverSupport' and 'services.changedetion-io.playwrightSupport' cannot be used together.";
}
];
systemd = let
defaultStateDir = cfg.datastorePath == "/var/lib/changedetection-io";
in {
services.changedetection-io = {
wantedBy = [ "mutli-user.target" ];
after = [ "network.target" ];
preStart = ''
mkdir -p ${cfg.datastorePath}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
StateDirectory = mkIf defaultStateDir "changedetion-io";
StateDirectoryMode = mkIf defaultStateDir "0750";
WorkingDirectory = cfg.datastorePath;
Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1"
++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub"
++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true";
EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStart = ''
${pkgs.changedetection-io}/bin/changedetection.py \
-h ${cfg.listenAddress} -p ${toString cfg.port} -d ${cfg.datastorePath}
'';
ProtectHome = true;
ProtectSystem = true;
Restart = "on-failure";
};
};
tmpfiles.rules = mkIf defaultStateDir [
"d ${cfg.datastorePath} 0750 ${cfg.user} ${cfg.group} - -"
];
};
users = {
users = optionalAttrs (cfg.user == "changedetection-io") {
"changedetection-io" = {
isSystemUser = true;
group = "changedetection-io";
};
};
groups = optionalAttrs (cfg.group == "changedetection-io") {
"changedetection-io" = { };
};
};
virtualisation = {
oci-containers.containers = lib.mkMerge [
(mkIf cfg.webDriverSupport {
changedetection-io-webdriver = {
image = "selenium/standalone-chrome";
environment = {
VNC_NO_PASSWORD = "1";
SCREEN_WIDTH = "1920";
SCREEN_HEIGHT = "1080";
SCREEN_DEPTH = "24";
};
ports = [
"127.0.0.1:${toString cfg.chromePort}:4444"
];
volumes = [
"/dev/shm:/dev/shm"
];
extraOptions = [ "--network=bridge" ];
};
})
(mkIf cfg.playwrightSupport {
changedetection-io-playwright = {
image = "browserless/chrome";
environment = {
SCREEN_WIDTH = "1920";
SCREEN_HEIGHT = "1024";
SCREEN_DEPTH = "16";
ENABLE_DEBUGGER = "false";
PREBOOT_CHROME = "true";
CONNECTION_TIMEOUT = "300000";
MAX_CONCURRENT_SESSIONS = "10";
CHROME_REFRESH_TIME = "600000";
DEFAULT_BLOCK_ADS = "true";
DEFAULT_STEALTH = "true";
};
ports = [
"127.0.0.1:${toString cfg.chromePort}:3000"
];
extraOptions = [ "--network=bridge" ];
};
})
];
};
};
}

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

@ -444,6 +444,7 @@ in {
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
nscd = handleTest ./nscd.nix {};
nsd = handleTest ./nsd.nix {};
ntfy-sh = handleTest ./ntfy-sh.nix {};
nzbget = handleTest ./nzbget.nix {};
nzbhydra2 = handleTest ./nzbhydra2.nix {};
oh-my-zsh = handleTest ./oh-my-zsh.nix {};

20
nixos/tests/ntfy-sh.nix Normal file
View File

@ -0,0 +1,20 @@
import ./make-test-python.nix {
nodes.machine = { ... }: {
services.ntfy-sh.enable = true;
};
testScript = ''
import json
msg = "Test notification"
machine.wait_for_unit("multi-user.target")
machine.succeed(f"curl -d '{msg}' localhost:80/test")
notif = json.loads(machine.succeed("curl -s localhost:80/test/json?poll=1"))
assert msg == notif["message"], "Wrong message"
'';
}

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

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.173.0";
version = "1.173.2";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-IMvcGuZotAOdbvMthkmeje3OmToPfPDlx0m87MW3lDE=";
hash = "sha256-i/MRBbwy/yJHltGXPjIb89hDXiUzNG6YL83LAAMRwdU=";
};
postPatch = ''

4
pkgs/applications/editors/cudatext/deps.json
View File

@ -21,8 +21,8 @@
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
"rev": "2022.10.15",
"hash": "sha256-McJTjPMzqtajtfpn01YoeHmZWkmbHxqAy5BmkKID1gE="
"rev": "2022.10.18",
"hash": "sha256-yaS1XF0v5rkfKj9aksSc4XimKh5wpL7yLt4ElcIKAIE="
},
"EControl": {
"owner": "Alexey-T",

2
pkgs/applications/editors/vim/plugins/deprecated.json
View File

@ -12,7 +12,7 @@
"new": "vim-gist"
},
"lua-dev-nvim": {
"date": "2022-10-18",
"date": "2022-10-20",
"new": "neodev-nvim"
},
"nvim-bufferline-lua": {

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

@ -281,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2022-10-17";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "b8b7109ee1edbe0d9e573e67eb9f8416f3b1e5ca";
sha256 = "0ycfbryjsnl6gzpxkpp96valc875sb2svd9avw8rf96mpfwsij3a";
rev = "fe35502e8c05d33bbc359487ee5b9cf7fad2a76a";
sha256 = "0w702smq4wa9cgx17mwsj59yl0rr1msppa5d3js0bkj27ij3g33k";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -341,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
rev = "2b95b6dcdeedc2ddca399f7fef4e3cd8b7c94e3e";
sha256 = "01iy43zc974znadbrlvg5zbx5yhy3rd0kymabshxcs10k1lpgmgp";
rev = "48c818a86224fd9b061092509db8706b5ae9f6bc";
sha256 = "17g4w29vgmgl3l5cwy7m8ylrm79jnz9yrr9rn60wxdf28zrig1gm";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
version = "2022-10-16";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
rev = "c2487319c083bc1da3aecf21e054c6cf1bbda9b3";
sha256 = "07l7xjzp4pn2lnkrq1rbl89bblf50plpx4wv1r7wli1mfginrkba";
rev = "d35799b510f6582f24765dcb8b293fc4988ccc41";
sha256 = "19njckq33dsjsr0xh8mq0vzsa25wv57ksykwxiia1afg9qnjvg0l";
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@ -798,12 +798,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
version = "2022-10-17";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "f827ad6d48d0278423ee1b45e3f2b94a3ac3d42d";
sha256 = "1lwi04ch6d0zfkflal73y1j8g284jxm92ssj91dk3grm4y70y0n4";
rev = "68a2751728f9ab3d3510f0fe9165a2a451aa8727";
sha256 = "0npwghnll4csngr0ly4wvqbrgmyn1dra138z43nm069w6n157q9g";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -930,12 +930,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2022-10-17";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "0073e32fbf391df5d83c1f4531bb0a41c85e0bec";
sha256 = "0fk8v1m36y6mgwc0m8lqz7z0ajcc7pylxapwzhphmmq4qgy0yp4f";
rev = "e70be6232f632d16d2412b1faf85554285036278";
sha256 = "13bbhhmqnygb92crn3pyrk66nc33sick7x23s8d1ffna7qcqirw6";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -990,12 +990,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
rev = "316b272cc01d450414651cf070bcc8c6beb0c144";
sha256 = "0z7g2bv1yajw8f1gwk3a24k8aczib7fpk3xivw7c6i5kkp4h02cw";
rev = "6e526a290877537e29112d511548301b1e1731b2";
sha256 = "1mvnpibq844300h7w6z00yjv815q81yj09clxgjdya3zpjm73d9y";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@ -1722,12 +1722,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
version = "2022-10-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "b2048d3a5a0195819c406bdbe1af9a7e418c48e4";
sha256 = "1zs6zhs0k8kki6jccjqc23yvdnj4gqpwqqk6i9l50b4gwx86zfcd";
rev = "853afde8027fda3eb687ea076fa4f5755c68e781";
sha256 = "1xgyi751dgjy9x5c1nfn5rcrcxm76f7fbx04qqmrivjjlqpg9a4k";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -2010,24 +2010,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "e45bdaa4bd5d2348a64c51596b91ab58b58bc2cf";
sha256 = "0033d4z0sjm4397wna1yb87vjm0gmjwr4b46pxv69zjikb38mxw3";
rev = "7d3a56b9eaaa99c8c73d4838630f46e81a016362";
sha256 = "0kxv53wnjxms3pn0dwg2z36f1lraw0fgxax4lb5i52mhwn7vg2qg";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "86ad87b631b207fa34e088fec3e8935a3e2c9120";
sha256 = "0qspw4as1fc0w3w7vr5hsw4p7rlcls9md653w68qxsbdyyhid69q";
rev = "5cbf8a2b67246dca9611b19000df9d1d04922cab";
sha256 = "1j0bja06gpnyqh0qb6kq1grmf0dr8p4k63w1rxjynj1fnnvp3vcs";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@ -2046,12 +2046,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "5d3d020720f49cf86c52a1bf2d132a37e07ad6b1";
sha256 = "0a0g1qi412cprj9gggiwaf43ld2s87m2c5wk5gpfk4y6zj8pawb1";
rev = "1a07d8454d620b386ed9c04c41097862b0d0ace4";
sha256 = "13maibc8vdd5gs194dmh2jdynjv4xryr6wjavryq2bfzh5kx6xx8";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -3059,12 +3059,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "5427104f8b7a7b24ea4a66d1d661b0560b159d99";
sha256 = "1wvvq5assplm4bbgpjv0q077b00rxvcajbd28r67b96zwsk0bp54";
rev = "5eeacc2f6646a2b51f99cb321c4d1e6c48abf22f";
sha256 = "0gp23r9kfnakcb4rxks9xx8dfiphgwwx34vccbmx51d490yb4b50";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@ -3839,24 +3839,24 @@ final: prev:
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
version = "2022-09-11";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
rev = "08e9a478877517b1f712e2a3f26b9d09552ef55d";
sha256 = "1yrzrdxx1ysx2yqxqkhkxk6vs1irir4r8bkhfdqj0h381fgbysyf";
rev = "fca7e3e59e6f9417d3fd77bac50d4b820a3e8bc4";
sha256 = "1pby3mx29wh5a0d4zdslkf43prm4f2w1an4qsyfhw2gn7kwmi2lj";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
rev = "6f692e38ef2852ac146124ff9bcd28b8d8c1b1de";
sha256 = "1lhz3x4mwwiz36hkxf8gv782j8218zfq86pav72dryvsjrfxyblc";
rev = "a6f8ea10900e8d891f9c93e0ed258f118010fb24";
sha256 = "085xazb21c27zj5zv5vynmj4mv6zda1xf8d4icfpw41z68p4c1la";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@ -3923,12 +3923,12 @@ final: prev:
lazy-lsp-nvim = buildVimPluginFrom2Nix {
pname = "lazy-lsp.nvim";
version = "2022-10-10";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "dundalek";
repo = "lazy-lsp.nvim";
rev = "c405a63b2424fec42bb67da53fc06b4a82a56963";
sha256 = "12b1pr23hl1avw4i44r47zkrw1h61qwz305l7gsngj3p69z4722r";
rev = "20f66b6a1ce6b22b3c02d0f53c15dfa7c6a9f3c8";
sha256 = "1yigp01qk2ljzb5sskgqic7igxwa4q8rkg4ga9czb3w4f84kpb09";
};
meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
};
@ -4400,18 +4400,6 @@ final: prev:
meta.homepage = "https://github.com/kkharji/lspsaga.nvim/";
};
lua-dev-nvim = buildVimPluginFrom2Nix {
pname = "lua-dev.nvim";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "dbd7bc1da13522eaad4022325f578c8c2d94d9a1";
sha256 = "101h55bal3bd25n8fjkz7djz1as1i94glcpikgjw94hcv95hvwk2";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
lualine-lsp-progress = buildVimPluginFrom2Nix {
pname = "lualine-lsp-progress";
version = "2021-10-23";
@ -4426,12 +4414,12 @@ final: prev:
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine.nvim";
version = "2022-10-06";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "nvim-lualine";
repo = "lualine.nvim";
rev = "edca2b03c724f22bdc310eee1587b1523f31ec7c";
sha256 = "06gy6jy3gfhhjcy61fx9myhs4bmknhlfsmnsi1mmcydhm4gcbm2b";
rev = "abb03129e0b0b7f4c992b1b4c98245cd4422e7d5";
sha256 = "1lwwhiwqv5f1i0v6a6g6zbmj5pfs5ya3mnxn3d36q8zf4ssz8xfh";
};
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
};
@ -4523,12 +4511,12 @@ final: prev:
material-nvim = buildVimPluginFrom2Nix {
pname = "material.nvim";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "marko-cerovac";
repo = "material.nvim";
rev = "e2bd86883263c1b009daf1fef1f5f2b2ea42024e";
sha256 = "1l9a2557ykdqngzwq7jqff2kp9apd0aqzq124675acjwcc1wam1h";
rev = "7fca639bd8e3c775be885383002cf8ebdc93a6f7";
sha256 = "17ih1lsxpalpj63gp2mdgwnzrvayqxn8s52wn1m4s92d0fs8pn3j";
};
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
@ -4905,6 +4893,18 @@ final: prev:
meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/";
};
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "218d9b06f6b91a0d5b9d8d9c165c5c286f9521ea";
sha256 = "0m88ykblj7nssw7l6492h742zl8cm0mhv23sb1nj73m5x95h4d4c";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2022-09-01";
@ -5159,12 +5159,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2022-10-15";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "15f3b5837a8d07f45cbe16753fbf13630bc167a3";
sha256 = "08zjhp1199yq5byrgksgaw55p3q74xr5j4ja24af08x8ifkr3bsj";
rev = "2ae719a01b80ca0629d5983aa9b23e7daf00744b";
sha256 = "1ph52n0y0pzb32wnzjg753wm8v5nj0l2wy00f6pyad9im2fmarqj";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@ -5207,12 +5207,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
version = "2022-10-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
rev = "57d68bff549860b30f22bd2e77b68f68593ad162";
sha256 = "1yq5lp0z9qll9rzjy7a5wa94iyxn53yk10ibxpikqi52q158267x";
rev = "b10055a599af8d86ea0ae75bc2abb953ba20acbc";
sha256 = "15c0jcyhklrf4h4mid1a3049257rkvlbsbabrcfk10g0kad71kai";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
@ -5243,12 +5243,12 @@ final: prev:
nordic-nvim = buildVimPluginFrom2Nix {
pname = "nordic.nvim";
version = "2022-10-17";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "nordic.nvim";
rev = "f9c9a672aea76da324eaa1b3c7f5dc8a3baf174e";
sha256 = "1i1wi7hp94wc04z9khsvriahdnmbslvnyn2035p4qf4jlbpwfvrg";
rev = "1d6602e05fa0bc256979a5af6f1a3bc4a13d64a9";
sha256 = "0iz0x03685vps5ns6hws1ym727s1c5535q8v21nkxzzm4qbwhi8j";
};
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
};
@ -5267,24 +5267,24 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
version = "2022-10-15";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "c59bdcfde011b88bfb71b5c4351684cf67bf5f9f";
sha256 = "0y8n8qpy3swvmd29cs4yf3krkjhlx324ncya0hzciqk5j9j3j9vh";
rev = "35758e946a64376e0e9625a27469410b3d1f9223";
sha256 = "03clg9m0rzqx8nmjk4brix21mrkr9n7229834d942gb3hssaxni0";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2022-10-13";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "643c67a296711ff40f1a4d1bec232fa20b179b90";
sha256 = "0wvbh0avz80g29ph52aqkxgnkykg58x5jcvn57zb0rb7dbbpcf56";
rev = "24463756e80ce381f530c02debe781f3c7ba7599";
sha256 = "07297dpachnvjpn9fff5yrbavaayxpgfwc0qyfi0na2ghylkhqn4";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -5339,12 +5339,12 @@ final: prev:
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
version = "2022-08-28";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "d2a56671ed19fb471acf0c39af261568ea47ee26";
sha256 = "1w4d0z06zzzjlksr6amdjqwb0lgvpidx3xi93n08yjbhzq0c0plw";
rev = "52e077ffadf3c03d2186515091fa9a88a1f950ac";
sha256 = "198hfiksp29pdqwklkbc5zp63wnvwz7d39vxpklywyvy1wdf6l1b";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
@ -5495,12 +5495,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2022-10-14";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "e71da68e59eec1df258acac20dad206366506438";
sha256 = "10vs85nmh3kk549p72mp712h4y8vyjhhkpi2ni2m6hlgld17zsyw";
rev = "3d0d7312bb2a8491eb2927504e5cfa6e81b66de4";
sha256 = "0apzpy1mchk6iz6gxx218l2cb7rkjwviil56ab9ndk5jdd1irjag";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -5519,12 +5519,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
version = "2022-10-06";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
rev = "1cd4764221c91686dcf4d6b62d7a7b2d112e0b13";
sha256 = "19fn9jghvjvmvfm06g2a1hbpm1yd9w5dnr5dcqpwcaz0pxi1y74x";
rev = "0a63115d72e071223e1711ce630e9e7b5737c948";
sha256 = "1swwyf498g69mm47whdyka7250pqg630fnhwkg0bzslv9ph891rg";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@ -5651,12 +5651,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2022-10-15";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "faf7ec2df507e16082afc4ef6b18813863f68dd8";
sha256 = "01sp8pgrqwdlzqkzdjbjmwp204hg3dil0yv21785dd4v68sa4h3c";
rev = "a59ab0202810c7230d54725535c3ca5dfe5bcbfc";
sha256 = "0dacpcmvsqsxdm0w2x30yxhlkqmng3nal8adva9sbmqywann6cxq";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -5735,12 +5735,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-10-17";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "2dd9e060f21eecd403736bef07ec83b73341d955";
sha256 = "1waw76d45n78sfxnmhnmcbzgzgv8mydsh2xqkzn5igcndx53h5mb";
rev = "3592f769f2d6b07ce3083744cd0a13442f5d4f43";
sha256 = "1sbk30f3ajpks6wxyj1gh9b11si59hmffn12wd7a00zvgbgqa4vr";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -5771,12 +5771,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2022-10-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "8f838ebbdc4e3078e178f1cf0474858a014f490e";
sha256 = "008kjzyb0nj2g1kmpir6ayxpmy7cpprhidzzsqyqra4kgsicbscd";
rev = "f2893fb6e3f089131fc8f7b45eb4eb86682034f4";
sha256 = "142rmhbqzjwg13zn9z50w92avq2gkylf7prcc35xf5rs9mc3kh0l";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@ -5879,12 +5879,12 @@ final: prev:
nvim-snippy = buildVimPluginFrom2Nix {
pname = "nvim-snippy";
version = "2022-10-15";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "dcampos";
repo = "nvim-snippy";
rev = "88bb84058c24f4ffe5ffecae9ca2dcb36a5dba4c";
sha256 = "1bi0hhl59xvmgbi8pcn6jp37p8665h3w8kx1if8dr2rjijrf6ay1";
rev = "d732f34c2c64baff182f9d9dc2463490fc3c7f91";
sha256 = "0a7g9s9c8wxk955qj0yvmmwzrv37x8wkn8c07arvp2xj77hpb6rc";
};
meta.homepage = "https://github.com/dcampos/nvim-snippy/";
};
@ -5903,12 +5903,12 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
version = "2022-09-27";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
rev = "6d877bc1f2262af1053da466e4acd909ad61bc18";
sha256 = "01cnc7wcm5qi2zm63v4hkzng6fm4945cw7r2n21gn914snypfxgg";
rev = "e27cf9f4506e39ba11a162c6c4aa8e5ff8f296f1";
sha256 = "0f3sy23jac31fgrcbphhdkl6y8iwi79i9c8yi8gsz3m6a3czhkpw";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
@ -5951,12 +5951,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-10-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "e06da64459e97ccbbf08a5a9e86d21a3663592be";
sha256 = "0swfiwpk3fq5f3r7dfw8wy3pp1nqk4xc48g6jsv5p43am6nzkdz3";
rev = "d49495fe72cbcedc944eece3611005dc0fa6acda";
sha256 = "1ngh7dlgppicdf5f5zs26wpyc2h0pqkqmgkhq288j7ic9lpw4z5x";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -6167,12 +6167,12 @@ final: prev:
onedark-nvim = buildVimPluginFrom2Nix {
pname = "onedark.nvim";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "navarasu";
repo = "onedark.nvim";
rev = "64fc4bc348e52e8e578beca26021d47c4d272a2a";
sha256 = "1b4rwap0dva67xg2vf2dj35522wjkfm061bpa6inbyg9waidf480";
rev = "fdfe7bfff486acd102aae7fb2ff52e7e5f6c2bad";
sha256 = "0z9kagqv196v0gcgm9zl1fp61j01msl4d00lndnlwnlggn2xcbf7";
};
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
};
@ -6191,12 +6191,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "55b2a219fd56f1984abf4c64913f32e89c80d890";
sha256 = "10lqlpcxgj8bxqh8hzqd8qzrphlai88zmi7ra6970lwg3g0y5484";
rev = "050e23fa587ee959387fe8d67711f189caa5704b";
sha256 = "0l7xb55r7jya594c06jswbvqk06cma2b50zhl0vw57fagir2258m";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -6215,12 +6215,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
version = "2022-10-18";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
rev = "98c64654375bc087e96bca08fd194066d778717c";
sha256 = "1k49wjlxbh2dsbmmp15www2fny9xjnq7z9ic95rfb8c9r6aipqx9";
rev = "1d4c13a7fb6480e4dd508cda8207732f18d419bf";
sha256 = "0l65mnshc6hmsarbr002z06k7c88aqyl0d4s9qqwdchlbi7h11dj";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@ -7553,12 +7553,12 @@ final: prev:
telescope-coc-nvim = buildVimPluginFrom2Nix {
pname = "telescope-coc.nvim";
version = "2022-10-10";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "telescope-coc.nvim";
rev = "da487dfd41266a0b5507a310da684ef3a3bfdb68";
sha256 = "1lnang3qn861z0p657aa8r7w6d1v6qn86gdwg7di11dgc5vljfh4";
rev = "0193fe529edd2cb61ccc020b492df76528f880fc";
sha256 = "1y7kav5749bznz5m7102igba29yvfbasnbn6hzsx57g8vj36kwbb";
};
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
};
@ -7963,12 +7963,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
version = "2022-10-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "2a2ce9bdb76d7a2104bbfa5cfbcadcd15de0d7e9";
sha256 = "0mxd15x2scx4a6w3vwdsx6h5zhlipi4ycckidv6ipqibf8k1gcf6";
rev = "9a0843ba36ff9720198ca15ac2351c40186543ab";
sha256 = "0srzfqwpfqs0iyhm10xfyrfx0zwj78kzqbhc12gkm1fp6nmh8n2g";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -10593,12 +10593,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2022-10-17";
version = "2022-10-19";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "2bb97d29382dea308d6887f493148d70a48c5ab1";
sha256 = "1cnr228iyh3p46bnk095shmhmljbazybabvbqrg214a0i9zwsamy";
rev = "a85b71bfc862753ee11ae5986d882bd9588b17a2";
sha256 = "00ll4lk9x0aail43dzlls70w53zggjz2am9kkn31cwhn4v5g9gng";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -11386,12 +11386,12 @@ final: prev:
vim-prosession = buildVimPluginFrom2Nix {
pname = "vim-prosession";
version = "2022-10-14";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-prosession";
rev = "7a3985a39cc5a63f037f64a20a15175310826b7e";
sha256 = "1inal1wmin8fia4b5h3ppyqsvakhhwgdg1y1p6hd0c29c954q0w2";
rev = "249b635d7483c8e1f8fcdcc50e1457b65a2bbf29";
sha256 = "07hyjp5y6sn4pdlc643251y5yqz6c0pqrd3vybfm4jhcy4zkvj89";
};
meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
};
@ -12082,12 +12082,12 @@ final: prev:
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
version = "2022-05-28";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
rev = "f47287df379bd5599ab5f118ed9b71c61097b516";
sha256 = "07xiln2qdb4ldplyx4schc0z1bw24zdnyfk1y03yjfx29rs0yxj4";
rev = "9555a3e6e5bcf285ec181b7fc983eea90500feb4";
sha256 = "0pzqk8h3h4z4dbgaxla76wlc1fzxk9cbw3xcwjpjgvbgxplg565s";
};
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
};
@ -12503,12 +12503,12 @@ final: prev:
vim-vsnip-integ = buildVimPluginFrom2Nix {
pname = "vim-vsnip-integ";
version = "2022-04-18";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip-integ";
rev = "64c2ed66406c58163cf81fb5e13ac2f9fcdfb52b";
sha256 = "0r4kxw112rxc7sz5dzcginbv5ak1as4ky40db2r5wdg5nm08c4z8";
rev = "4be94fb2a0d51b2fdf1a508d31cf62b3bff48e6d";
sha256 = "0gza8nxzs6qc2w66fa1rjsgrhkmgllfflnf1jhrqn5rsdcq7fs0y";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
};
@ -13177,12 +13177,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2022-10-14";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "d5f8176232d91c50265f01674d99bf0ab4e79273";
sha256 = "1i00c70rq62m9dnh4pg7xc852hapl0f162rr255i79amrp7fsvfy";
rev = "56604126c671aac3bebd6a33c9d1c55ac9359ce1";
sha256 = "0czkqads8i9m0vc2np55glay0s6ii1y6nbb07sr9ck356qj6ix40";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -13201,12 +13201,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-10-19";
version = "2022-10-20";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "0fca048835601f00f3fa9c8566de304350edf4ea";
sha256 = "01jfq0cr7agp98adsyi4i0hmawz9v5g0n7xrlxqv88jvjawws637";
rev = "d028cffc3dfb9f78187c6bb3c57013af3e8ab081";
sha256 = "0l9x1kvjbsg6c2d9ww6hmf0qz8v5r34g80agqw8is5nvmbsqfa8j";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

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

@ -368,7 +368,6 @@ https://github.com/ray-x/lsp_signature.nvim/,,
https://github.com/lspcontainers/lspcontainers.nvim/,,
https://github.com/onsails/lspkind-nvim/,,
https://github.com/tami5/lspsaga.nvim/,,
https://github.com/folke/lua-dev.nvim/,,
https://github.com/arkav/lualine-lsp-progress/,,
https://github.com/nvim-lualine/lualine.nvim/,,
https://github.com/l3mon4d3/luasnip/,,
@ -411,6 +410,7 @@ https://github.com/Shougo/neco-syntax/,,
https://github.com/Shougo/neco-vim/,,
https://github.com/Shougo/neocomplete.vim/,,
https://github.com/KeitaNakamura/neodark.vim/,,
https://github.com/folke/neodev.nvim/,HEAD,
https://github.com/sbdchd/neoformat/,,
https://github.com/TimUntersberger/neogit/,,
https://github.com/Shougo/neoinclude.vim/,,

2
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2375,6 +2375,8 @@ let
};
};
sumneko.lua = callPackage ./lua { };
svelte.svelte-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "svelte-vscode";

27
pkgs/applications/editors/vscode/extensions/lua/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, vscode-utils
, sumneko-lua-language-server
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lua";
publisher = "sumneko";
version = "3.5.6";
sha256 = "sha256-Unzs9rX/0MlQprSvScdBCCFMeLCaGzWsMbcFqSKY2XY=";
};
patches = [ ./remove-chmod.patch ];
postInstall = ''
ln -sf ${sumneko-lua-language-server}/bin/lua-language-server \
$out/$installPrefix/server/bin/lua-language-server
'';
meta = with lib; {
description = "The Lua language server provides various language features for Lua to make development easier and faster.";
homepage = "https://marketplace.visualstudio.com/items?itemName=sumneko.lua";
license = licenses.mit;
maintainers = with maintainers; [ lblasc ];
};
}

16
pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/client/out/languageserver.js b/client/out/languageserver.js
index 6c7429c..6f53aa4 100644
--- a/client/out/languageserver.js
+++ b/client/out/languageserver.js
@@ -79,11 +79,9 @@ class LuaClient {
break;
case "linux":
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-Linux', 'lua-language-server'));
- yield fs.promises.chmod(command, '777');
break;
case "darwin":
command = this.context.asAbsolutePath(path.join('server', binDir ? binDir : 'bin-macOS', 'lua-language-server'));
- yield fs.promises.chmod(command, '777');
break;
}
let serverOptions = {

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0hj6rpg65ivnnvzfjm16vjpjzzqbabpw5ldrr78x7ddrr06h02z6";
x86_64-darwin = "01gskihfp5s0j4dw8nxmfsp0sav1zqlmylmvwhi1y2qqq4y9c3w9";
aarch64-linux = "07n1svlkd2ji4b6yvhci6qvx429xipp8y418cqq3173gw8v59lws";
aarch64-darwin = "0gr94l7lk54fhhhqbiv23hd7d25xilqlwla2dbs5c171nj9pz325";
armv7l-linux = "0nxnjrzwfvma9zl4x11r45qwqq8mk91cxg47mg33qgr22lvbgz63";
x86_64-linux = "0cf6zlwslii30877p5vb0varxs6ai5r1g9wxx1b45yrmp7rvda91";
x86_64-darwin = "0j9kb7j2rvrgc2dzxhi1nzs78lzhpkfk3gcqcq84hcsga0n59y03";
aarch64-linux = "1bf2kvnd2pz2sk26bq1wm868bvvmrg338ipysmryilhk0l490vcx";
aarch64-darwin = "1rwwrzabxgw2wryi6rp8sc1jqps54p7a3cjpn4q94kds8rk5j0qn";
armv7l-linux = "0p2kwfq74lz43vpfh90xfrqsz7nwgcjsvqwkifkchp1m3xnil742";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.72.1";
version = "1.72.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

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

@ -42,7 +42,7 @@ buildPythonApplication rec {
click-plugins
elasticsearch
flask-compress
flask_login
flask-login
flask-wtf
html2text
python-dotenv

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

@ -95,7 +95,7 @@ let
flask
flask-babel
flask_assets
flask_login
flask-login
flask-limiter
frozendict
future

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

@ -62,8 +62,8 @@ rec {
};
kops_1_25 = mkKops rec {
version = "1.25.1";
sha256 = "sha256-wKmEdcORXBKQ1AjYr0tNimxs//tSNPO3VQpEPC2mieA=";
version = "1.25.2";
sha256 = "sha256-JJGb12uuOvZQ+bA82nrs9vKRT2hEvnPrOH8XNHfYVD8=";
rev = "v${version}";
};
}

6
pkgs/applications/networking/flexget/default.nix
View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.37";
version = "3.3.38";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-9rNdl76taviGfy5va3VLmZpqH2nErAMhOg2gQQCfJyI=";
hash = "sha256-mOjI2pN/KEY//+i+2YmLjUqQwv223jYhu+KjPMRPAaw=";
};
postPatch = ''
@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
cherrypy
flask-compress
flask-cors
flask_login
flask-login
flask-restful
flask-restx
flask

4
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.11.3";
version = "0.11.4";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
sha256 = "sha256-2Tn/04Bbj+mUsV0gftEUXQmFYWTQyVaPNHZQVk57Avo=";
sha256 = "sha256-1NwaR8EMH2EQKskkPSrfWbUu8Ib7DwI6UNL3nOtc/tM=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

2
pkgs/applications/networking/powerdns-admin/default.nix
View File

@ -18,7 +18,7 @@ let
};
pythonDeps = with python.pkgs; [
flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
mysqlclient psycopg2 sqlalchemy
cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython
gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core

4
pkgs/applications/networking/shellhub-agent/default.nix
View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "XYDS9g118jv7BoI0QSncZMPspSwcnAIFKdjUgttlTgU=";
sha256 = "ov1hA+3sKh9Ms5D3/+ubwcAp+skuIfB3pvsvNSUKiSE=";
};
modRoot = "./agent";

4
pkgs/applications/radio/multimon-ng/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "multimon-ng";
version = "1.1.9";
version = "1.2.0";
src = fetchFromGitHub {
owner = "EliasOenal";
repo = "multimon-ng";
rev = version;
sha256 = "01716cfhxfzsab9zjply9giaa4nn4b7rm3p3vizrwi7n253yiwm2";
sha256 = "sha256-Qk9zg3aSrEfC16wQqL/EMG6MPobX8dnJ1OLH8EMap0I=";
};
buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ];

4
pkgs/data/themes/orchis-theme/default.nix
View File

@ -22,13 +22,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) ''
stdenvNoCC.mkDerivation
rec {
pname = "orchis-theme";
version = "2022-09-28";
version = "2022-10-19";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "sha256-gabOn5ErJjDgqZCyIboMgFb1FqmDw8dljIskBENKTBg=";
sha256 = "sha256-1lJUrWkb8IoUyCMn8J4Lwvs/pWsibrY0pSXrepuQcug=";
};
nativeBuildInputs = [ gtk3 sassc ];

1074
pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.8.0.json Normal file
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/compilers/cudatoolkit/versions.toml
View File

@ -65,3 +65,9 @@ version = "11.7.0"
url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run"
sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY="
gcc = "gcc11"
["11.8"]
version = "11.8.0"
url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run"
sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY="
gcc = "gcc11"

4
pkgs/development/interpreters/bats/default.nix
View File

@ -22,13 +22,13 @@
resholve.mkDerivation rec {
pname = "bats";
version = "1.8.0";
version = "1.8.2";
src = fetchFromGitHub {
owner = "bats-core";
repo = "bats-core";
rev = "v${version}";
sha256 = "sha256-dnNB82vEv49xzmH3r9dLL4aMIi61HQDr0gVin2H+jOw=";
sha256 = "sha256-Kitlx26cK2RiAC+PdRIdDLF5crorg6UB6uSzbKCrDHE=";
};
patchPhase = ''

58
pkgs/development/libraries/science/math/cudnn/extension.nix
View File

@ -2,6 +2,7 @@ final: prev: let
inherit (final) callPackage;
inherit (prev) cudatoolkit cudaVersion lib pkgs;
inherit (prev.lib.versions) major;
### CuDNN
@ -27,7 +28,9 @@ final: prev: let
# Add all supported builds as attributes
allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildCuDnnPackage (removeAttrs file ["fileVersion"]))) supportedVersions;
# Set the default attributes, e.g. cudnn = cudnn_8_3_1;
defaultBuild = { "cudnn" = allBuilds.${computeName cuDnnDefaultVersion}; };
defaultBuild = { "cudnn" = if allBuilds ? ${computeName cuDnnDefaultVersion}
then allBuilds.${computeName cuDnnDefaultVersion}
else throw "cudnn-${cuDnnDefaultVersion} does not support your cuda version ${cudaVersion}"; };
in allBuilds // defaultBuild;
cuDnnVersions = let
@ -113,21 +116,54 @@ final: prev: let
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
}
];
"8.5.0" = [
rec {
fileVersion = "10.2";
fullVersion = "8.5.0.96";
hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "10.2" ];
}
rec {
fileVersion = "11.7";
fullVersion = "8.5.0.96";
hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ];
}
];
"8.6.0" = [
rec {
fileVersion = "10.2";
fullVersion = "8.6.0.163";
hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "10.2" ];
}
rec {
fileVersion = "11.7";
fullVersion = "8.6.0.163";
hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4=";
url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz";
supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ];
}
];
};
# Default attributes
cuDnnDefaultVersion = {
"10.0" = "7.4.2";
"10.1" = "7.6.5";
"10.2" = "8.3.2";
"11.0" = "8.3.2";
"11.1" = "8.3.2";
"11.2" = "8.3.2";
"11.3" = "8.3.2";
"11.4" = "8.3.2";
"11.5" = "8.3.2";
"11.6" = "8.3.2";
"11.7" = "8.4.0";
}.${cudaVersion} or "8.3.2";
"10.2" = "8.6.0";
"11.0" = "8.6.0";
"11.1" = "8.6.0";
"11.2" = "8.6.0";
"11.3" = "8.6.0";
"11.4" = "8.6.0";
"11.5" = "8.6.0";
"11.6" = "8.6.0";
"11.7" = "8.6.0";
"11.8" = "8.6.0";
}.${cudaVersion} or "8.6.0";
in cuDnnPackages

4
pkgs/development/libraries/science/math/tensorrt/extension.nix
View File

@ -24,7 +24,9 @@ final: prev: let
# Add all supported builds as attributes
allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions;
# Set the default attributes, e.g. tensorrt = tensorrt_8_4;
defaultBuild = { "tensorrt" = allBuilds.${computeName tensorRTDefaultVersion}; };
defaultBuild = { "tensorrt" = if allBuilds ? ${computeName tensorRTDefaultVersion}
then allBuilds.${computeName tensorRTDefaultVersion}
else throw "tensorrt-${tensorRTDefaultVersion} does not support your cuda version ${cudaVersion}"; };
in allBuilds // defaultBuild;
tensorRTVersions = {

4
pkgs/development/python-modules/apache-airflow/default.nix
View File

@ -20,7 +20,7 @@
, deprecated
, dill
, flask
, flask_login
, flask-login
, flask-appbuilder
, flask-caching
, flask-session
@ -159,7 +159,7 @@ buildPythonPackage rec {
flask-caching
flask-session
flask-wtf
flask_login
flask-login
GitPython
graphviz
gunicorn

4
pkgs/development/python-modules/flask-appbuilder/default.nix
View File

@ -8,7 +8,7 @@
, email-validator
, flask
, flask-babel
, flask_login
, flask-login
, flask-openid
, flask-sqlalchemy
, flask-wtf
@ -59,7 +59,7 @@ buildPythonPackage rec {
email-validator
flask
flask-babel
flask_login
flask-login
flask-openid
flask-sqlalchemy
flask-wtf

4
pkgs/development/python-modules/flask-security-too/default.nix
View File

@ -25,7 +25,7 @@
, blinker
, email-validator
, flask
, flask_login
, flask-login
, flask_principal
, flask-wtf
, itsdangerous
@ -57,7 +57,7 @@ buildPythonPackage rec {
blinker
email-validator
flask
flask_login
flask-login
flask_principal
flask-wtf
itsdangerous

38
pkgs/development/python-modules/inscriptis/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, lxml
, pytestCheckHook
, requests
}:
buildPythonPackage rec {
pname = "inscriptis";
version = "2.3.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "weblyzard";
repo = "inscriptis";
rev = version;
sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY=";
};
propagatedBuildInputs = [
lxml
requests
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "inscriptis" ];
meta = with lib; {
description = "inscriptis - HTML to text converter";
homepage = "https://github.com/weblyzard/inscriptis";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

7
pkgs/development/python-modules/jsonpath-ng/default.nix
View File

@ -9,13 +9,14 @@
buildPythonPackage rec {
pname = "jsonpath-ng";
version = "1.5.2";
version = "1.5.3";
src = fetchFromGitHub {
owner = "h2non";
repo = pname;
rev = "v${version}";
sha256 = "1cxjwhx0nj85a3awnl7j6afnk07awzv45qfwxl5jqbbc9cxh5bd6";
# missing tag https://github.com/h2non/jsonpath-ng/issues/114
rev = "cce4a3d4063ac8af928795acc53beb27a2bfd101";
sha256 = "sha256-+9iQHQs5TQhZFeIqMlsa3FFPfZEktAWy1lSdJU7kZrc=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/nuitka/default.nix
View File

@ -10,15 +10,15 @@
}:
buildPythonPackage rec {
version = "0.6.14.5";
version = "1.1.5";
pname = "Nuitka";
# Latest version is not yet on PyPi
src = fetchFromGitHub {
owner = "kayhayen";
owner = "Nuitka";
repo = "Nuitka";
rev = version;
sha256 = "08kcp22zdgp25kk4bp56z196mn6bdi3z4x0q2y9vyz0ywfzp9zap";
sha256 = "0wgcl860acbxnq8q9hck147yhxz8pcbqhv9glracfnrsd2qkpgpp";
};
checkInputs = [ vmprof pyqt4 ];

221
pkgs/development/python-modules/playwright/default.nix Normal file
View File

@ -0,0 +1,221 @@
{ lib
, stdenv
, buildPythonPackage
, chromium
, ffmpeg
, firefox
, git
, greenlet
, jq
, nodejs
, fetchFromGitHub
, fetchurl
, makeFontsConf
, makeWrapper
, pyee
, python
, pythonOlder
, runCommand
, setuptools-scm
, unzip
}:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
driverVersion = "1.27.1";
driver = let
suffix = {
x86_64-linux = "linux";
aarch64-linux = "linux-arm64";
x86_64-darwin = "mac";
aarch64-darwin = "mac-arm64";
}.${system} or throwSystem;
filename = "playwright-${driverVersion}-${suffix}.zip";
in stdenv.mkDerivation {
pname = "playwright-driver";
version = driverVersion;
src = fetchurl {
url = "https://playwright.azureedge.net/builds/driver/${filename}";
sha256 = {
x86_64-linux = "0x71b4kb8hlyacixipgfbgjgrbmhckxpbmrs2xk8iis7n5kg7539";
aarch64-linux = "125lih7g2gj91k7j196wy5a5746wyfr8idj3ng369yh5wl7lfcfv";
x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a";
aarch64-darwin = "0qajh4ac5lr1sznb2c471r5c5g2r0dk2pyqz8vhvnbk36r524h1h";
}.${system} or throwSystem;
};
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
postPatch = ''
# Use Nix's NodeJS instead of the bundled one.
substituteInPlace playwright.sh --replace '"$SCRIPT_PATH/node"' '"${nodejs}/bin/node"'
rm node
# Hard-code the script path to $out directory to avoid a dependency on coreutils
substituteInPlace playwright.sh \
--replace 'SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"' "SCRIPT_PATH=$out"
patchShebangs playwright.sh package/bin/*.sh
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv playwright.sh $out/bin/playwright
mv package $out/
runHook postInstall
'';
passthru = {
inherit filename;
};
};
browsers-mac = stdenv.mkDerivation {
pname = "playwright-browsers";
version = driverVersion;
src = runCommand "playwright-browsers-base" {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = {
x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a";
}.${system} or throwSystem;
} ''
export PLAYWRIGHT_BROWSERS_PATH=$out
${driver}/bin/playwright install
rm -r $out/.links
'';
installPhase = ''
mkdir $out
cp -r * $out/
'';
};
browsers-linux = { withFirefox ? true, withChromium ? true }: let
fontconfig = makeFontsConf {
fontDirectories = [];
};
in runCommand ("playwright-browsers"
+ lib.optionalString (withFirefox && !withChromium) "-firefox"
+ lib.optionalString (!withFirefox && withChromium) "-chromium")
{
nativeBuildInputs = [
makeWrapper
jq
];
} (''
BROWSERS_JSON=${driver}/share/playwright-driver/package/browsers.json
'' + lib.optionalString withChromium ''
CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON)
mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux
# See here for the Chrome options:
# https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738
makeWrapper ${chromium}/bin/chromium $out/chromium-$CHROMIUM_REVISION/chrome-linux/chrome \
--set SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
--set FONTCONFIG_FILE ${fontconfig}
'' + lib.optionalString withFirefox ''
FIREFOX_REVISION=$(jq -r '.browsers[] | select(.name == "firefox").revision' $BROWSERS_JSON)
mkdir -p $out/firefox-$FIREFOX_REVISION
ln -s ${firefox}/bin/firefox $out/firefox-$FIREFOX_REVISION/firefox
'' + ''
FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON)
mkdir -p $out/ffmpeg-$FFMPEG_REVISION
ln -s ${ffmpeg}/bin/ffmpeg $out/ffmpeg-$FFMPEG_REVISION/ffmpeg-linux
'');
in
buildPythonPackage rec {
pname = "playwright";
version = "1.27.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "microsoft";
repo = "playwright-python";
rev = "v${version}";
sha256 = "sha256-cI/4GdkmTikoP9O0Skh/0jCxxRypRua0231iKcxtBcY=";
};
patches = [
# This patches two things:
# - The driver location, which is now a static package in the Nix store.
# - The setup script, which would try to download the driver package from
# a CDN and patch wheels so that they include it. We don't want this
# we have our own driver build.
./driver-location.patch
];
postPatch = ''
# if setuptools_scm is not listing files via git almost all python files are excluded
export HOME=$(mktemp -d)
git init .
git add -A .
git config --global user.email "nixpkgs"
git config --global user.name "nixpkgs"
git commit -m "workaround setuptools-scm"
substituteInPlace setup.py \
--replace "greenlet==1.1.3" "greenlet>=1.1.3" \
--replace "pyee==8.1.0" "pyee>=8.1.0" \
--replace "setuptools-scm==7.0.5" "setuptools-scm>=7.0.5" \
--replace "wheel==0.37.1" "wheel>=0.37.1"
# Skip trying to download and extract the driver.
# This is done manually in postInstall instead.
substituteInPlace setup.py \
--replace "self._download_and_extract_local_driver(base_wheel_bundles)" ""
# Set the correct driver path with the help of a patch in patches
substituteInPlace playwright/_impl/_driver.py \
--replace "@driver@" "${driver}/bin/playwright"
'';
nativeBuildInputs = [ git setuptools-scm ];
propagatedBuildInputs = [
greenlet
pyee
];
postInstall = ''
ln -s ${driver} $out/${python.sitePackages}/playwright/driver
'';
# Skip tests because they require network access.
doCheck = false;
pythonImportsCheck = [
"playwright"
];
passthru = {
inherit driver;
browsers = {
x86_64-linux = browsers-linux { };
aarch64-linux = browsers-linux { };
x86_64-darwin = browsers-mac;
aarch64-darwin = browsers-mac;
}.${system} or throwSystem;
browsers-chromium = browsers-linux { withFirefox = false; };
browsers-firefox = browsers-linux { withChromium = false; };
};
meta = with lib; {
description = "Python version of the Playwright testing and automation library";
homepage = "https://github.com/microsoft/playwright-python";
license = licenses.asl20;
maintainers = with maintainers; [ techknowlogick yrd SuperSandro2000 ];
};
}

47
pkgs/development/python-modules/playwright/driver-location.patch Normal file
View File

@ -0,0 +1,47 @@
diff --git a/playwright/_impl/_driver.py b/playwright/_impl/_driver.py
index f3b911f..d00e509 100644
--- a/playwright/_impl/_driver.py
+++ b/playwright/_impl/_driver.py
@@ -23,11 +23,7 @@ from playwright._repo_version import version
def compute_driver_executable() -> Path:
- package_path = Path(inspect.getfile(playwright)).parent
- platform = sys.platform
- if platform == "win32":
- return package_path / "driver" / "playwright.cmd"
- return package_path / "driver" / "playwright.sh"
+ return Path("@driver@")
if sys.version_info.major == 3 and sys.version_info.minor == 7:
diff --git a/setup.py b/setup.py
index 3487a6a..05112c2 100644
--- a/setup.py
+++ b/setup.py
@@ -141,25 +141,8 @@ class PlaywrightBDistWheelCommand(BDistWheelCommand):
base_wheel_location: str = glob.glob(os.path.join(self.dist_dir, "*.whl"))[0]
without_platform = base_wheel_location[:-7]
for wheel_bundle in wheels:
- download_driver(wheel_bundle["zip_name"])
- zip_file = (
- f"driver/playwright-{driver_version}-{wheel_bundle['zip_name']}.zip"
- )
- with zipfile.ZipFile(zip_file, "r") as zip:
- extractall(zip, f"driver/{wheel_bundle['zip_name']}")
wheel_location = without_platform + wheel_bundle["wheel"]
shutil.copy(base_wheel_location, wheel_location)
- with zipfile.ZipFile(wheel_location, "a") as zip:
- driver_root = os.path.abspath(f"driver/{wheel_bundle['zip_name']}")
- for dir_path, _, files in os.walk(driver_root):
- for file in files:
- from_path = os.path.join(dir_path, file)
- to_path = os.path.relpath(from_path, driver_root)
- zip.write(from_path, f"playwright/driver/{to_path}")
- zip.writestr(
- "playwright/driver/README.md",
- f"{wheel_bundle['wheel']} driver package",
- )
os.remove(base_wheel_location)
if InWheel:
for whlfile in glob.glob(os.path.join(self.dist_dir, "*.whl")):

31
pkgs/development/python-modules/playwright/update.sh Executable file
View File

@ -0,0 +1,31 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts
set -euo pipefail
root="$(dirname "$(readlink -f "$0")")"
version=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s https://api.github.com/repos/microsoft/playwright-python/releases/latest | jq -r '.tag_name | sub("^v"; "")')
# Most of the time, this should be the latest stable release of the Node-based
# Playwright version, but that isn't a guarantee, so this needs to be specified
# as well:
setup_py_url="https://github.com/microsoft/playwright-python/raw/v${version}/setup.py"
driver_version=$(curl -Ls "$setup_py_url" | grep '^driver_version =' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
fetch_driver_arch() {
nix-prefetch-url "https://playwright.azureedge.net/builds/driver/playwright-${version}-${1}.zip"
}
replace_sha() {
sed -i "s|$1 = \".\{44,52\}\"|$1 = \"$2\"|" "$root/default.nix"
}
# Replace SHAs for the driver downloads
replace_sha "x86_64-linux" "$(fetch_driver_arch "linux")"
replace_sha "x86_64-darwin" "$(fetch_driver_arch "mac")"
replace_sha "aarch64-linux" "$(fetch_driver_arch "linux-arm64")"
replace_sha "aarch64-darwin" "$(fetch_driver_arch "mac-arm64")"
# Update the version stamps
sed -i "s/driverVersion = \"[^\$]*\"/driverVersion = \"$driver_version\"/" "$root/default.nix"
update-source-version playwright "$version" --rev="v$version"

9
pkgs/development/python-modules/selenium/default.nix
View File

@ -12,14 +12,15 @@
buildPythonPackage rec {
pname = "selenium";
version = "4.4.2";
version = "4.5.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SeleniumHQ";
repo = "selenium";
rev = "refs/tags/selenium-${version}-python"; # check if there is a newer tag with -python suffix
hash = "sha256-sJJ3i4mnGp5fDgo64p6B2vRCqp/Wm99VoyRLyy4nBH8=";
# check if there is a newer tag with or without -python suffix
rev = "refs/tags/selenium-${version}";
hash = "sha256-K90CQYTeX9GKpP0ahxLx2HO5HG0P6MN7jeWmHtfiOns=";
};
postPatch = ''
@ -50,6 +51,6 @@ buildPythonPackage rec {
description = "Bindings for Selenium WebDriver";
homepage = "https://selenium.dev/";
license = licenses.asl20;
maintainers = with maintainers; [ jraygauthier ];
maintainers = with maintainers; [ jraygauthier SuperSandro2000 ];
};
}

2
pkgs/development/python-modules/sentry-sdk/default.nix
View File

@ -19,7 +19,7 @@
, django
, falcon
, flask
, flask_login
, flask-login
, httpx
, pure-eval
, pyramid

4
pkgs/development/python-modules/sqlalchemy-continuum/default.nix
View File

@ -2,7 +2,7 @@
, fetchPypi
, buildPythonPackage
, flask
, flask_login
, flask-login
, flask-sqlalchemy
, flexmock
, pytestCheckHook
@ -32,7 +32,7 @@ buildPythonPackage rec {
pytestCheckHook
sqlalchemy-i18n
flask
flask_login
flask-login
flask-sqlalchemy
flexmock
];

2
pkgs/development/r-modules/default.nix
View File

@ -360,7 +360,7 @@ let
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
mvabund = [ pkgs.gsl ];
mwaved = [ pkgs.fftw.dev ];
mzR = with pkgs; [ zlib boost159.dev netcdf ];
mzR = with pkgs; [ zlib netcdf ];
ncdf4 = [ pkgs.netcdf ];
nloptr = with pkgs; [ nlopt pkg-config libiconv ];
n1qn1 = [ pkgs.gfortran ];

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "12.6.1";
version = "12.6.5";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-09MLV6t062fT3P7G1pgJedzLLLuXoP+I/95WadMYLSw=";
sha256 = "sha256-oo3ygMdc+9Tt5hViKucLBaMatlVmmAb4QopJ9JWBJU8=";
};
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

30
pkgs/development/tools/rust/cauwugo/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, rustPlatform, fetchCrate, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "cauwugo";
version = "0.1.0";
src = fetchCrate {
inherit version;
pname = "bpaf_cauwugo";
sha256 = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww=";
};
cargoSha256 = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd cauwugo \
--bash <($out/bin/cauwugo --bpaf-complete-style-bash) \
--fish <($out/bin/cauwugo --bpaf-complete-style-fish) \
--zsh <($out/bin/cauwugo --bpaf-complete-style-zsh)
'';
meta = with lib; {
description = "An alternative cargo frontend that implements dynamic shell completion for usual cargo commands";
homepage = "https://github.com/pacak/bpaf/tree/master/bpaf_cauwugo";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/servers/consul/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
version = "1.13.2";
version = "1.13.3";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
sha256 = "sha256-+5I5hsVuLZve4FJHe41rKycWuKNv7UdxCSi4kaKk2/w=";
sha256 = "sha256-pTBeR7WP25Ng1OiVkZ60wTYnSOWahkx6LYHScnX0fWw=";
};
passthru.tests.consul = nixosTests.consul;
@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
vendorSha256 = "sha256-SjTG1/WhfGhLuUherVHEC3PmDz4HLMS2Cg0ReKTm0zk=";
vendorSha256 = "sha256-ZarkaUP9jwwP9FReaVAfPaQzKFETUEHsCsVDGFYKJvU=";
doCheck = false;

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.29.0.6244-819d3678c";
version = "1.29.1.6316-f4cdfea9c";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "sha256-f9QRaAF9qE3NpCt3lMWQ7MAbfLI7YQaIIF/fkJorUxY=";
sha256 = "sha256-FiUeZFIeXk27VQY99d2a98iBQgy7ESKd0HvYRclQHq8=";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "sha256-iGMO6uuNm2c7UBZvA5dYaSxUrEQCL1tR9zLA3rZhBn4=";
sha256 = "sha256-6VSYQO6KmbAC4vlU3McF4QmuJIopBVB7aV5bpNqOSv0=";
};
outputs = [ "out" "basedb" ];

92
pkgs/servers/web-apps/changedetection-io/default.nix Normal file
View File

@ -0,0 +1,92 @@
{ lib
, fetchFromGitHub
, python3
}:
let
py = python3.override {
packageOverrides = final: prev: {
flask = prev.flask.overridePythonAttrs (old: rec {
version = "2.1.3";
src = old.src.override {
inherit version;
sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
};
});
flask-restful = prev.flask-restful.overridePythonAttrs (old: rec {
disabledTests = old.disabledTests or [ ] ++ [
# fails because of flask or werkzeug downgrade
"test_redirect"
];
});
werkzeug = prev.werkzeug.overridePythonAttrs (old: rec {
version = "2.0.3";
src = old.src.override {
inherit version;
sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
};
});
};
};
in
py.pkgs.buildPythonApplication rec {
pname = "changedetection-io";
version = "0.39.20.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "dgtlmoon";
repo = "changedetection.io";
rev = version;
sha256 = "sha256-0Sv/1YoZuSnslQgMOu+uHTxb9QewXPC0tLAvzJA4Aa8=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "bs4" "beautifulsoup4" \
--replace "cryptography ~= 3.4" "cryptography" \
--replace "selenium ~= 4.1.0" "selenium"
'';
propagatedBuildInputs = with py.pkgs; [
flask
flask-wtf
eventlet
validators
timeago
inscriptis
feedgen
flask-login
flask-restful
pytz
brotli
requests
urllib3
chardet
wtforms
jsonpath-ng
jq
apprise
paho-mqtt
cryptography
beautifulsoup4
lxml
selenium
werkzeug
playwright
] ++ requests.optional-dependencies.socks;
# tests can currently not be run in one pytest invocation and without docker
doCheck = false;
checkInputs = with py.pkgs; [
pytest-flask
pytestCheckHook
];
meta = with lib; {
homepage = "https://github.com/dgtlmoon/changedetection.io";
description = "Simplest self-hosted free open source website change detection tracking, monitoring and notification service";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/test/cuda/cuda-samples/extension.nix
View File

@ -11,9 +11,9 @@ final: prev: let
"11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
"11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI=";
"11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE=";
# the tag 11.7 does not exists: see https://github.com/NVIDIA/cuda-samples/issues/128
# maybe fixed by https://github.com/NVIDIA/cuda-samples/pull/133
"11.7" = throw "The tag 11.7 of cuda-samples does not exists (see see https://github.com/NVIDIA/cuda-samples/issues/128)";
"11.7" = throw "The tag 11.7 of cuda-samples does not exist";
"11.8" = throw "The tag 11.8 of cuda-samples does not exist";
}.${prev.cudaVersion};
in {

4
pkgs/tools/admin/credhub-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.5";
version = "2.9.6";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-M2FIzLl1pQ/TJinG4UOh2VQWfZx4iT3Qw6pJhjv88cM=";
sha256 = "sha256-g7LJlMKwV3Cq0LEBPWPgzPJAp9W6bwVuuVVv/ZhuBSM=";
};
# these tests require network access that we're not going to give them

2
pkgs/tools/admin/pgadmin/default.nix
View File

@ -29,7 +29,7 @@ let
buildDeps = with pythonPackages; [
flask
flask-gravatar
flask_login
flask-login
flask_mail
flask_migrate
flask-sqlalchemy

2
pkgs/tools/archivers/unar/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
--replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
--replace "-DGNU_RUNTIME=1" "" \
--replace "-fgnu-runtime" "-fobjc-nonfragile-abi"
--replace "-fgnu-runtime" "-fobjc-runtime=gnustep-2.0"
done
# we need to build inside this directory as well, so we have to make it writeable

6
pkgs/tools/filesystems/lfs/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "lfs";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7dSBac+rLedgko4KLVS9ZWrj/IlXJMsnbQFzyQxv4LQ=";
sha256 = "sha256-+BkHE4vl1oYNR5SX2y7Goly7OwGDXRoZex6YL7Xv2QI=";
};
cargoSha256 = "sha256-stDxDBftIVZqgy49VGJHx+JTzflVE91QN75aSWhvgSs=";
cargoSha256 = "sha256-njrjuLHDmcubw8lLPpS9K5la0gRIKq4OrP+MXs1Ro/o=";
meta = with lib; {
description = "Get information on your mounted disks";

91
pkgs/tools/filesystems/netatalk/default.nix
View File

@ -1,14 +1,15 @@
{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3
, db, libgcrypt, avahi, libiconv, pam, openssl, acl
, ed, libtirpc, libevent, fetchpatch
}:
{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3, db
, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, libtirpc, libevent
, fetchpatch }:
stdenv.mkDerivation rec {
pname = "netatalk";
version = "3.1.13";
release = "3.1.13";
patch = "3";
version = "${release}_${patch}";
src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2";
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${release}.tar.bz2";
sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9";
};
@ -17,12 +18,86 @@ stdenv.mkDerivation rec {
./omitLocalstatedirCreation.patch
(fetchpatch {
name = "make-afpstats-python3-compatible.patch";
url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
url =
"https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
freeBSDPatches = [
# https://bugs.freebsd.org/263123
(fetchpatch {
name = "patch-etc_afpd_directory.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c";
sha256 = "sha256-07YAJs+EtqGcFXbYHDLbILved1Ebtd8ukQepvzy6et0=";
})
(fetchpatch {
name = "patch-etc_afpd_file.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c";
sha256 = "sha256-T1WTNa2G6wxKtvMa/MCX3Vx6XZBHtU6w3enkdGuIWus=";
})
(fetchpatch {
name = "patch-etc_afpd_volume.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c";
sha256 = "sha256-NOZNZGzA0hxrNkoLTvN64h40yApPbMH4qIfBTpQoI0s=";
})
(fetchpatch {
name = "patch-etc_cnid__dbd_cmd__dbd__scanvol.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c";
sha256 = "sha256-5QV+tQDo8/XeKwH/e5+Ne+kEOl2uvRDbHMaWysIB6YU=";
})
(fetchpatch {
name = "patch-libatalk_adouble_ad__attr.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__attr.c";
sha256 = "sha256-Ose6BdilwBOmoYpm8Jat1B3biOXJj4y3U4T49zE0G7Y=";
})
(fetchpatch {
name = "patch-libatalk_adouble_ad__conv.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c";
sha256 = "sha256-T27WlKVXosv4bX5Gek2bR2cVDYEee5qrH4mnL9ghbP8=";
})
(fetchpatch {
name = "patch-libatalk_adouble_ad__date.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c";
sha256 = "sha256-fkW5A+7R5fT3bukRfZaOwFo7AsyPaYajc1hIlDMZMnc=";
})
(fetchpatch {
name = "patch-libatalk_adouble_ad__flush.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c";
sha256 = "sha256-k2zTx35tAlsFHym83bZGoWXRomwFV9xT3r2fzr3Zvbk=";
})
(fetchpatch {
name = "patch-libatalk_adouble_ad__open.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c";
sha256 = "sha256-uV4wwft2IH54+4k5YR+Gz/BpRZBanxX/Ukp8BkohInU=";
})
# https://bugs.freebsd.org/251203
(fetchpatch {
name = "patch-libatalk_vfs_extattr.c";
url =
"https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c";
sha256 = "sha256-lFWF0Qo8PJv7QKvnMn0Fc9Ruzb+FTEWgOMpxc789jWs=";
})
];
postPatch = ''
# freeBSD patches are -p0
for i in $freeBSDPatches ; do
patch -p0 < $i
done
'';
nativeBuildInputs =
[ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];

2
pkgs/tools/misc/lemmeknow/default.nix
View File

@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec {
description = "A tool to identify anything";
homepage = "https://github.com/swanandx/lemmeknow";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
maintainers = with maintainers; [ figsoda Br1ght0ne ];
};
}

6
pkgs/tools/networking/proxify/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "proxify";
version = "0.0.7";
version = "0.0.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "v${version}";
sha256 = "sha256-6YsduuiPgwxcSkqEcMxEhubte87IxWV9Qa1Vyv0Pd5w=";
sha256 = "sha256-0zXWW6U+x9W+fMsvYTfWRdoftsQCp2JXXkfbqS63Svk=";
};
vendorSha256 = "sha256-ewPimn70cheToU33g3p9s0MHxQdbKiqhGReKLgiHOSI=";
vendorSha256 = "sha256-OldZyaPROtnPZPczFjn+kl61TI5zco/gM2MuPn2gYjo=";
meta = with lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";

36
pkgs/top-level/all-packages.nix
View File

@ -3562,6 +3562,8 @@ with pkgs;
cambalache = callPackage ../development/tools/cambalache { };
changedetection-io = callPackage ../servers/web-apps/changedetection-io { };
clipster = callPackage ../tools/misc/clipster { };
clockify = callPackage ../applications/office/clockify {
@ -5619,6 +5621,7 @@ with pkgs;
cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; };
cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; };
cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaVersion = "11.8"; };
cudaPackages_11 = cudaPackages_11_7;
cudaPackages = recurseIntoAttrs cudaPackages_11;
@ -10304,6 +10307,8 @@ with pkgs;
playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
playwright = with python3Packages; toPythonApplication playwright;
please = callPackage ../tools/security/please { };
plecost = callPackage ../tools/security/plecost { };
@ -14995,6 +15000,8 @@ with pkgs;
cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { };
cauwugo = callPackage ../development/tools/rust/cauwugo { };
crate2nix = callPackage ../development/tools/rust/crate2nix { };
convco = callPackage ../development/tools/convco {
@ -18511,9 +18518,28 @@ with pkgs;
linbox = callPackage ../development/libraries/linbox { };
ffmpeg_4-headless = callPackage ../development/libraries/ffmpeg/4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
sdlSupport = false;
vdpauSupport = false;
pulseaudioSupport = false;
libva = libva-minimal;
};
ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
};
ffmpeg_5-headless = callPackage ../development/libraries/ffmpeg/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
sdlSupport = false;
vdpauSupport = false;
pulseaudioSupport = false;
libva = libva-minimal;
};
ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
};
@ -18525,6 +18551,8 @@ with pkgs;
# version number which the upstream support.
ffmpeg = ffmpeg_4;
ffmpeg-headless = ffmpeg_4-headless;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
svt-av1 = if stdenv.isAarch64 then null else svt-av1;
rtmpdump = null; # Prefer the built-in RTMP implementation
@ -32296,7 +32324,9 @@ with pkgs;
enableX11 = config.unison.enableX11 or true;
};
unpaper = callPackage ../tools/graphics/unpaper { };
unpaper = callPackage ../tools/graphics/unpaper {
ffmpeg_5 = ffmpeg_5-headless;
};
unison-ucm = callPackage ../development/compilers/unison { };
@ -37721,7 +37751,9 @@ with pkgs;
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
navidrome = callPackage ../servers/misc/navidrome {};
navidrome = callPackage ../servers/misc/navidrome {
ffmpeg = ffmpeg-headless;
};
zalgo = callPackage ../tools/misc/zalgo { };

1
pkgs/top-level/python-aliases.nix
View File

@ -76,6 +76,7 @@ mapAliases ({
face_recognition_models = face-recognition-models; # added 2022-10-15
fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
flask_login = flask-login; # added 2022-10-17
flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
flask_testing = flask-testing; # added 2022-04-25
flask_wtf = flask-wtf; # added 2022-05-24

8
pkgs/top-level/python-packages.nix
View File

@ -3439,7 +3439,7 @@ in {
flask-limiter = callPackage ../development/python-modules/flask-limiter { };
flask_login = callPackage ../development/python-modules/flask-login { };
flask-login = callPackage ../development/python-modules/flask-login { };
flask_mail = callPackage ../development/python-modules/flask-mail { };
@ -4610,6 +4610,8 @@ in {
inquirer = callPackage ../development/python-modules/inquirer { };
inscriptis = callPackage ../development/python-modules/inscriptis { };
insegel = callPackage ../development/python-modules/insegel { };
installer = callPackage ../development/python-modules/installer { };
@ -7030,6 +7032,10 @@ in {
pkuseg = callPackage ../development/python-modules/pkuseg { };
playwright = callPackage ../development/python-modules/playwright {
inherit (pkgs) jq;
};
pmsensor = callPackage ../development/python-modules/pmsensor { };
ppdeep = callPackage ../development/python-modules/ppdeep { };