nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 20:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2022-12-12 00:13:29 +00:00
committed by GitHub
parent 2117c50988 125f48d490
commit 653a5e185c
119 changed files with 21165 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
doc/contributing/coding-conventions.chapter.md
View File

@@ -487,12 +487,12 @@ Preferred source hash type is sha256. There are several ways to get it.
- `lib.fakeHash`
- `lib.fakeSha256`
- `lib.fakeSha512`
in the package expression, attempt build and extract correct hash from error messages.
::: {.warning}
You must use one of these four fake hashes and not some arbitrarily-chosen hash.
See [](#sec-source-hashes-security).
:::
@@ -670,3 +670,18 @@ stdenv.mkDerivation {
...
}
```
### Import From Derivation {#ssec-import-from-derivation}
Import From Derivation (IFD) is disallowed in Nixpkgs for performance reasons:
[Hydra] evaluates the entire package set, and sequential builds during evaluation would increase evaluation times to become impractical.
[Hydra]: https://github.com/NixOS/hydra
Import From Derivation can be worked around in some cases by committing generated intermediate files to version control and reading those instead.
<!-- TODO: remove the following and link to Nix manual once https://github.com/NixOS/nix/pull/7332 is merged -->
See also [NixOS Wiki: Import From Derivation].
[NixOS Wiki: Import From Derivation]: https://nixos.wiki/wiki/Import_From_Derivation

11
doc/languages-frameworks/javascript.section.md
View File

@@ -330,13 +330,16 @@ mkYarnPackage rec {
- The `echo 9` steps comes from this answer: <https://stackoverflow.com/a/49139496>
- Exporting the headers in `npm_config_nodedir` comes from this issue: <https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919>
## Outside of nixpkgs {#javascript-outside-nixpkgs}
## Outside Nixpkgs {#javascript-outside-nixpkgs}
There are some other options available that can't be used inside nixpkgs. Those other options are written in Nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in Hydra at present. If you are packaging something outside nixpkgs, those can be considered
There are some other tools available, which are written in the Nix language.
These that can't be used inside Nixpkgs because they require [Import From Derivation](#ssec-import-from-derivation), which is not allowed in Nixpkgs.
If you are packaging something outside Nixpkgs, consider the following:
### npmlock2nix {#javascript-npmlock2nix}
[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the API might be subject to change.
[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building `node_modules` without code generation. It hasn't reached v1 yet, the API might be subject to change.
#### Pitfalls {#javascript-npmlock2nix-pitfalls}
@@ -344,7 +347,7 @@ There are some [problems with npm v7](https://github.com/tweag/npmlock2nix/issue
### nix-npm-buildpackage {#javascript-nix-npm-buildpackage}
[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building node_modules without code generation. It hasn't reached v1 yet, the API might change. It supports both package-lock.json and yarn.lock.
[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building `node_modules` without code generation. It hasn't reached v1 yet, the API might change. It supports both `package-lock.json` and yarn.lock.
#### Pitfalls {#javascript-nix-npm-buildpackage-pitfalls}

13
lib/strings.nix
View File

@@ -860,9 +860,9 @@ rec {
*/
toInt = str:
let
# RegEx: Match any leading whitespace, then any digits, and finally match any trailing
# whitespace.
strippedInput = match "[[:space:]]*([[:digit:]]+)[[:space:]]*" str;
# RegEx: Match any leading whitespace, possibly a '-', one or more digits,
# and finally match any trailing whitespace.
strippedInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*" str;
# RegEx: Match a leading '0' then one or more digits.
isLeadingZero = match "0[[:digit:]]+" (head strippedInput) == [];
@@ -911,9 +911,10 @@ rec {
*/
toIntBase10 = str:
let
# RegEx: Match any leading whitespace, then match any zero padding, capture any remaining
# digits after that, and finally match any trailing whitespace.
strippedInput = match "[[:space:]]*0*([[:digit:]]+)[[:space:]]*" str;
# RegEx: Match any leading whitespace, then match any zero padding,
# capture possibly a '-' followed by one or more digits,
# and finally match any trailing whitespace.
strippedInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*" str;
# RegEx: Match at least one '0'.
isZero = match "0+" (head strippedInput) == [];

4
lib/tests/misc.nix
View File

@@ -339,6 +339,8 @@ runTests {
(0 == toInt " 0")
(0 == toInt "0 ")
(0 == toInt " 0 ")
(-1 == toInt "-1")
(-1 == toInt " -1 ")
];
testToIntFails = testAllTrue [
@@ -383,6 +385,8 @@ runTests {
(0 == toIntBase10 " 000000")
(0 == toIntBase10 "000000 ")
(0 == toIntBase10 " 000000 ")
(-1 == toIntBase10 "-1")
(-1 == toIntBase10 " -1 ")
];
testToIntBase10Fails = testAllTrue [

8
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View File

@@ -37,6 +37,14 @@
<link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://v2raya.org">v2rayA</link>, a Linux
web GUI client of Project V which supports V2Ray, Xray, SS,
SSR, Trojan and Pingtunnel. Available as
<link xlink:href="options.html#opt-services.v2raya.enable">services.v2raya</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-23.05-incompatibilities">

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

@@ -18,6 +18,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
- [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable).
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

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

@@ -997,6 +997,7 @@
./services/video/rtsp-simple-server.nix
./services/networking/uptermd.nix
./services/networking/v2ray.nix
./services/networking/v2raya.nix
./services/networking/vdirsyncer.nix
./services/networking/vsftpd.nix
./services/networking/wasabibackend.nix

11
nixos/modules/services/games/factorio.nix
View File

@@ -39,7 +39,7 @@ let
} // cfg.extraSettings;
serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins);
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat;
in
{
options = {
@@ -136,6 +136,15 @@ in
derivations via nixos-channel. Until then, this is for experts only.
'';
};
mods-dat = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Mods settings can be changed by specifying a dat file, in the [mod
settings file
format](https://wiki.factorio.com/Mod_settings_file_format).
'';
};
game-name = mkOption {
type = types.nullOr types.str;
default = "Factorio Game";

6
nixos/modules/services/home-automation/evcc.nix
View File

@@ -48,7 +48,10 @@ in
wantedBy = [
"multi-user.target"
];
environment.HOME = "/var/lib/evcc";
path = with pkgs; [
glibc # requires getent
];
serviceConfig = {
ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}";
CapabilityBoundingSet = [ "" ];
@@ -77,6 +80,7 @@ in
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
StateDirectory = "evcc";
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"

27
nixos/modules/services/networking/resilio.nix
View File

@@ -52,17 +52,22 @@ let
runConfigPath = "/run/rslsync/config.json";
createConfig = pkgs.writeShellScriptBin "create-resilio-config" ''
${pkgs.jq}/bin/jq \
'.shared_folders |= map(.secret = $ARGS.named[.dir])' \
${
lib.concatMapStringsSep " \\\n "
(entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'')
sharedFoldersSecretFiles
} \
<${configFile} \
>${runConfigPath}
'';
createConfig = pkgs.writeShellScriptBin "create-resilio-config" (
if cfg.sharedFolders != [ ] then ''
${pkgs.jq}/bin/jq \
'.shared_folders |= map(.secret = $ARGS.named[.dir])' \
${
lib.concatMapStringsSep " \\\n "
(entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'')
sharedFoldersSecretFiles
} \
<${configFile} \
>${runConfigPath}
'' else ''
# no secrets, passing through config
cp ${configFile} ${runConfigPath};
''
);
in
{

39
nixos/modules/services/networking/v2raya.nix Normal file
View File

@@ -0,0 +1,39 @@
{ config, pkgs, lib, ... }:
with lib;
{
options = {
services.v2raya = {
enable = options.mkEnableOption (mdDoc "the v2rayA service");
};
};
config = mkIf config.services.v2raya.enable {
environment.systemPackages = [ pkgs.v2raya ];
systemd.services.v2raya = {
unitConfig = {
Description = "v2rayA service";
Documentation = "https://github.com/v2rayA/v2rayA/wiki";
After = [ "network.target" "nss-lookup.target" "iptables.service" "ip6tables.service" ];
Wants = [ "network.target" ];
};
serviceConfig = {
User = "root";
ExecStart = "${getExe pkgs.v2raya} --log-disable-timestamp";
Environment = [ "V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log" ];
LimitNPROC = 500;
LimitNOFILE = 1000000;
Restart = "on-failure";
Type = "simple";
};
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality
};
};
meta.maintainers = with maintainers; [ elliot ];
}

1
nixos/tests/evcc.nix
View File

@@ -87,6 +87,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
with subtest("Check journal for errors"):
_, output = machine.execute("journalctl -o cat -u evcc.service")
assert "FATAL" not in output
assert "ERROR" not in output
with subtest("Check systemd hardening"):

4
pkgs/applications/audio/pt2-clone/default.nix
View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.54";
version = "1.55";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-d/BUt6jqJmw2MnerbvvhuUWpTHgQr47XuSoFDXo7GEQ=";
sha256 = "sha256-NwkHb0FOg9wAgtcEtWqOpNGvBXjQIoc4pMmf/32Gxr0=";
};
nativeBuildInputs = [ cmake ];

15
pkgs/applications/audio/pyradio/default.nix
View File

@@ -1,17 +1,23 @@
{ lib, python3Packages, fetchFromGitHub, installShellFiles }:
{ lib
, python3Packages
, fetchFromGitHub
, installShellFiles
}:
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.8.9.31";
version = "0.8.9.32";
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-9Fc42f0plduihXDDLXWBdt62maxDJ0cwumIvbiMcrGc=";
hash = "sha256-1lczH8xTZV1XVVByLAGXJbjXd20JUJALIJJ3s9+orxM=";
};
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = with python3Packages; [
requests
@@ -30,6 +36,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
homepage = "http://www.coderholic.com/pyradio/";
description = "Curses based internet radio player";
changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ contrun ];
};

6
pkgs/applications/audio/reaper/default.nix
View File

@@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.66";
version = "6.71";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs=";
aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo=";
x86_64-linux = "sha256-AHi0US3U4PU/IrlCahJbm+tkmsz+nh0AFOk0lB2lI3M=";
aarch64-linux = "sha256-/yCV7wllQ024rux4u4Tp9TZK8JMN9Tk0DFJY3W2BGAk=";
}.${stdenv.hostPlatform.system};
};

4
pkgs/applications/backup/unifi-protect-backup/default.nix
View File

@@ -2,7 +2,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "unifi-protect-backup";
version = "0.8.3";
version = "0.8.7";
format = "pyproject";
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "ep1cman";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3iOaJZAvkhjiWLKI1m2hmVkWLaNtq74nQZYIm/XCgeA=";
hash = "sha256-VIA7/jWMuAWYle3tBDgKU5PJ9wkHChEjNns8lhYr1K8=";
};
preBuild = ''

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

@@ -437,12 +437,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2022-11-19";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "2d1de481a94a3be428c87ab0404c38e58b386813";
sha256 = "0g780ykjiya6clc3yi8ky4lxhyj2ayc629wn5i2iq8siwm4ab07v";
rev = "508b8c64bfbc2ad3106ae67b7828936035b3095e";
sha256 = "19i19r1z0dqb24fg2z5fpi5m2n155n3v5pw2hq8cq28m0392rbvd";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -535,12 +535,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2022-12-06";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "42a17dec166783dc50b7105a0837f715fe9bd432";
sha256 = "1l8g4aiyxw207nrrb0vjbyqc1n91smxv5g8n8m0hd6wlw0fia1ls";
rev = "8bcbb2995822c4062d00cb41df713fd76092f04f";
sha256 = "0n7adhyc30778zd0l1pfml0xna8zfxcahzr9fxryqkx0ragp94jn";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -751,12 +751,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2022-11-22";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "da03666a61af32eb0f57b37f18c020a3a33a44d4";
sha256 = "06ygwxgxzrma96waa3dc8sk258kfv4gjdjf80lg5sc41iv972x6r";
rev = "9639b071d9680764b6e57b08c9fa4a336453558d";
sha256 = "034ynhab8mq00w6zhdni8qz6fvvwaa33fshk5q36379lamcrlxq4";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -979,12 +979,12 @@ final: prev:
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar.vim";
version = "2022-12-05";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
rev = "8eee411e280277cd186a3fea0debe754132b5b7b";
sha256 = "0haf5ls2y7p6b6nc7b9wlr47h7wbxnk8v6m2mpgvdmbrqylwp9zp";
rev = "3b91377f0e8655894b29c166c796ab9e2c0bf077";
sha256 = "1121rlyd9kj08ixnjq541x02ckf5g2l1gyic342d11lpwwbpmqc7";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@@ -2023,24 +2023,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
rev = "3cc371dbddb400c0fc5e8edeb423b14cd5084276";
sha256 = "1wblwq215xldsl86m728866n677q064x55xm425riisd376xarka";
rev = "9a1f60036152f55337095f754d2cba7c56224357";
sha256 = "1idfkgvgswz2jlrp06ijazfh6j3qd57x9m1swzq0r412q504bnll";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
rev = "ccc1f692da9fbb9a87fe7eb5ccd341a3c35283a6";
sha256 = "021cyhwza7skml7j0k26mf159myr4d8j8m9rq01id0j3xy5zqjgb";
rev = "eb30460696570af7d6adc75870274ec541cfce71";
sha256 = "1d67vyvz8fwibsp8vbiqjkjdkxcixgj53czc1v2p50q3d98bhv49";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2059,12 +2059,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "95d658235c75016dcfd4e1468d07de72a4bfad49";
sha256 = "1nsy1j221hps1z3rxvq9xd4k29wxjl3wss2dcpgcillgspl9rrrz";
rev = "6a49da213ab217360cbcad46df01f3be74a2970e";
sha256 = "0dn47bwk4irpwb0r99zw2m23nqvas9hc5k78vxssr1zpilcbg58d";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2625,12 +2625,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2022-12-06";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "7645a4de7d60a31ff75ddda52f224889ee4cc3f5";
sha256 = "0nc4pzwa6nzk5nc5h6qx9srawq5vb0nl2f7dhkcrwv2k4mci3b56";
rev = "3fef2ddad976873dd9c9e769e14bd6ae10a3fdff";
sha256 = "1f0g63h2kbs5vzfan7cfirk3c0aqv3mhp32bpf3scalrdrwr5mpi";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@@ -3348,12 +3348,12 @@ final: prev:
graphviz-vim = buildVimPluginFrom2Nix {
pname = "graphviz.vim";
version = "2021-04-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "graphviz.vim";
rev = "12b04c512694ace2fc15735676f5afdd05519466";
sha256 = "1ky9rar3gxvsf0n3y71qfln4pxmz3hpq3dqimbf0r8l8q7sw483r";
rev = "773d5a5d014af5ed19ec3f2c182c1a167ff958f2";
sha256 = "1hhn96pm7vkxjridf0piqy400z79injvqw1hg943w0aa7pq2y46z";
};
meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
};
@@ -3467,12 +3467,12 @@ final: prev:
haskell-tools-nvim = buildVimPluginFrom2Nix {
pname = "haskell-tools.nvim";
version = "2022-12-06";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "d21677e8901577b52b37dadec03030c4e5f4cd53";
sha256 = "1jlr8yp5vkx3vs5i3cprmhljsnrq54ssj1nqcjgmmak2brhlgrjz";
rev = "c2701b5d15f9634dbdcae0e34d6f6ec952adc5da";
sha256 = "1s8vm54d3n5c1g89cw04n88fmyn6cgcyygshpj46m0qgykpigs20";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@@ -4295,12 +4295,12 @@ final: prev:
litee-nvim = buildVimPluginFrom2Nix {
pname = "litee.nvim";
version = "2022-10-15";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ldelossa";
repo = "litee.nvim";
rev = "c28f62b9eb78afc398e070b650c59e1fb8668b66";
sha256 = "06mn4np083am7l3dspf7j8nfkin5k86pdg3gymyqzf6mj8vs90y8";
rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2";
sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq";
};
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
};
@@ -4486,12 +4486,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2022-12-05";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "5ce70a08442e97ac55ce14e71dd7d151ea5f4d8e";
sha256 = "1fncj4l72pwhwx9drqplm432zjg76y4clyw2kdpivs6nvghisjfv";
rev = "40b5c6272384d90365e7149e0fcc73afae5e87cc";
sha256 = "1hsp7d9mb877whm7rcbvg4k3l9rjz3p3jfjwsr6n6wpspq9xids1";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4607,12 +4607,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2022-12-02";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "6402c79d73c07ad19374dc7b4f9d4bdfc2f57f42";
sha256 = "0iqc4l9qdr1y3nbkzijcp2c1in8r1ybqvbjl9p92x6zdvmxff2jr";
rev = "82e04074117635ebe7ae2202953a0c3d78db5146";
sha256 = "1rr5xb4nkwm4vjk8v2065dy7d55qgh8wr6fhgash2gzrfjvm7b8a";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -4967,12 +4967,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "44da95e38c294ddc43fe6b39df6b6e99ecfda52a";
sha256 = "1hkzf105900zfclan6qckpvljs0mk48dgjxdf80fq0khy0c1whhy";
rev = "7c59fa1292377a43e314d6d493438ff8af8aa853";
sha256 = "0n4n5cyppnhwg5gd865iy6ifm36ysw876v5rphnhlvlsa34alng6";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@@ -5135,12 +5135,12 @@ final: prev:
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
rev = "a77f3ab85518b0cfb43d6074c27f3a2abc0aac75";
sha256 = "1fwmx1b6z8pfbb2baj198saliwf5572bvh69ma1ch6zm593vkp2z";
rev = "21f4b943ea3a39c3046aac9d286bdc13be6f50da";
sha256 = "0g79qsa34d7xz45cn6apcp1npkkbjwbijkgzylxllaz27pd7g2k4";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
@@ -5399,12 +5399,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2022-12-08";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "a0acd495f5edce6d4d5d3c6bd63d2319ccded9ed";
sha256 = "1d5ybbpl0vfszfxjx9rkvd76j8jibcjqbgb9njy36d15qq3fv0ph";
rev = "adaa799264c92eea42d500c8b98e19caf32c14dc";
sha256 = "1vi9n07mf258pkkhh8c28l846j88f248gzwcrv40i8n3v3mxz7f6";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5639,12 +5639,12 @@ final: prev:
nvim-dap-go = buildVimPluginFrom2Nix {
pname = "nvim-dap-go";
version = "2022-11-04";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "leoluz";
repo = "nvim-dap-go";
rev = "c75921726ccfe97070285f206de49eddff276ea5";
sha256 = "1sgz5vkkw0zmpnmdfla2k3bvkax5pvn2y9g79xq3vhg9x6gyil5s";
rev = "4dd9c899997599c93a28aadf864a7924a4031f3e";
sha256 = "19r5fhn9iy6bis84q373dslb15pi30ca2dv85ll7dwizyz8kvdac";
};
meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
};
@@ -5879,12 +5879,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "8a3e5f9add9cd408c7063619c8d612700bf25d4d";
sha256 = "1cjv3pdbmgjh956sp02vjg4i5bjfimj8awahvw9a9bjkwr56d8wl";
rev = "6eb24ef9175d1fa3c7a23e115854b1a2d923d386";
sha256 = "0qwc6c1s37vyv913m984yicj3fkich26c06zs86q6pnc1n65cfl9";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -6107,24 +6107,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2022-12-03";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "f8489c992998e1e1b45aec65bdb9615e5cd59a61";
sha256 = "0md5xavzksj4lh1vbd24zq29bwgcb7057dw31invc7adm7sfh1wr";
rev = "7177d95ac0f46bf02ff3f8375e135149a3fc79b8";
sha256 = "1h0qvy6dh1lkm74r11r6d989adfbcx3xszyj13pchcangp7mhfrv";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-12-09";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "35ad87384b3e47b3b5758d1642bbea08c70200c0";
sha256 = "0jy5lq1r7dq1ib3mmx3izihcxv985rda468h33y0hvk11l36mx88";
rev = "619f1ace03860d668c7a661332c38480f2db2584";
sha256 = "05gj2gxi5bhi2xg6ihgwckjkcspaijdyrgbwzh96hz766s0zz3f3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -6167,12 +6167,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2022-11-27";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "98476e7364821989ab9b500e4d20d9ae2c5f6564";
sha256 = "1gvksha3l3pripy7rsk1axr9n0wmzsh2xr1461vjz3314sdfikyj";
rev = "e8b7807e0398754bd7dbb5cae043340374975f77";
sha256 = "18vc5nzvxijg8nm7k635y0w95lihqgwyix4ljwrx7gqr73smwqv9";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -6215,12 +6215,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2022-11-26";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
rev = "189ad3790d57c548896a78522fd8b0d0fc11be31";
sha256 = "1k45pgz1jldkrczxyhhv6abj1klbkl07g2lxw7hhlsbyflg7h9sv";
rev = "05e1072f63f6c194ac6e867b567e6b437d3d4622";
sha256 = "1b53nrmzga6bkf6cdck3hdwjyrlslyrsa7jv55198jy153y8qq2z";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@@ -6383,12 +6383,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
version = "2022-11-06";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
rev = "0cd9f681bee019715bfbe928891579a3af3331e8";
sha256 = "0rgmzi1ivh1xjjmsfdjwljvm175sr0pbmbf2gixqmi22dfkndcwq";
rev = "d6ff2f0f4b4e16cc458a45abafa80718f3101db9";
sha256 = "1whk7afv98yc786a12dls2x9x0x6i2ydmy6lgqjqls8c89q30j19";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@@ -6419,12 +6419,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
version = "2022-12-07";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
rev = "d3980a5cda71266579ef773168d7750e04911877";
sha256 = "1wlmzsj70x891bcxkdcwgx7hiljhgcl73w2i9vadk4n51hxc57h7";
rev = "aba09c510a60ad469f3fd46e0a7c492ec610e5fb";
sha256 = "0mv1wa4p5bsylvjc7z979bhh3flpyndkvzvz079l2kanja033996";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -7105,12 +7105,12 @@ final: prev:
seoul256-vim = buildVimPluginFrom2Nix {
pname = "seoul256.vim";
version = "2022-08-18";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "junegunn";
repo = "seoul256.vim";
rev = "1c48e3e1e3f3521920788d90a83819cff14eadc9";
sha256 = "092szdfi1nmap52i7pcm51k2ymqj0hd4kii66pgaqsskslnc03gk";
rev = "9faf491b28c747707037b6b47c6a52af313b9c17";
sha256 = "1n39rfb1747yrziv2cja1ahlmj4ja2w7ww4lyr2q1r3whb71jrw0";
};
meta.homepage = "https://github.com/junegunn/seoul256.vim/";
};
@@ -8082,12 +8082,12 @@ final: prev:
thesaurus_query-vim = buildVimPluginFrom2Nix {
pname = "thesaurus_query.vim";
version = "2022-01-30";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ron89";
repo = "thesaurus_query.vim";
rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332";
sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi";
rev = "92be7e003236f4d43b86ad1b84d092fceb982ed4";
sha256 = "0xpkns5c8f0svcj6h9kff6y0909vw0yzg1fs9n9xgnx7r1qgcb5k";
};
meta.homepage = "https://github.com/ron89/thesaurus_query.vim/";
};
@@ -8239,12 +8239,12 @@ final: prev:
treesj = buildVimPluginFrom2Nix {
pname = "treesj";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "Wansmer";
repo = "treesj";
rev = "1c4447d01cfed64fdb9a62fd69611dc8d6b9ade0";
sha256 = "188xd9zwy9kx3gmlagbk4rw2wsspszx8zqg57kv6xa15zb4c6366";
rev = "3a28195c7d683fe076df51849f8252c7da50c8b4";
sha256 = "1aj8m1845dajiffisw23fha6w5r34m2k7dipdarm9qkipf59i3b2";
};
meta.homepage = "https://github.com/Wansmer/treesj/";
};
@@ -9859,12 +9859,12 @@ final: prev:
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
version = "2022-04-19";
version = "2022-12-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
rev = "b6bef833b56632df917bcf33bc50b8a5d1e26139";
sha256 = "1b0qw5l8gyq3bf8ii1f2xb7kfdgyi0c4yivcmmziq8nqvrzwwzwp";
rev = "09729769c47a5afc1da0682116425e103e817e28";
sha256 = "0ymab8zyznf2ylh8smngd3nq4dpzgrx6zh5i5b149vrm9jiymxqz";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@@ -10713,12 +10713,12 @@ final: prev:
vim-lawrencium = buildVimPluginFrom2Nix {
pname = "vim-lawrencium";
version = "2021-11-08";
version = "2022-01-19";
src = fetchFromGitHub {
owner = "ludovicchabant";
repo = "vim-lawrencium";
rev = "eee52c9da9a58c1f079adb4a3134a0620bc6e945";
sha256 = "12431h344dhjswg0pm8nvfszy8hp8b61nm0r8gsry9a6w1j1a86b";
rev = "cfda83655a3885f410fcf96ea1104ea0431570c3";
sha256 = "0jxk4xc10n6llr4hx67laxkx9rygrk0w6zyfvb2cpzcjranfmxnp";
};
meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/";
};
@@ -11060,6 +11060,18 @@ final: prev:
meta.homepage = "https://github.com/phanviet/vim-monokai-pro/";
};
vim-monokai-tasty = buildVimPluginFrom2Nix {
pname = "vim-monokai-tasty";
version = "2022-11-25";
src = fetchFromGitHub {
owner = "patstockwell";
repo = "vim-monokai-tasty";
rev = "55dcb855be754178967b860b0fa63621c319ce0a";
sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8";
};
meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/";
};
vim-move = buildVimPluginFrom2Nix {
pname = "vim-move";
version = "2022-07-01";
@@ -13513,12 +13525,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2022-12-09";
version = "2022-12-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "d55d81eabfeacbfb167e2948790ae94aaba3b149";
sha256 = "0xhcrh1zyjq7i5kdsvw1v2f83m0d3ikv8hzpvpkm13zkhzasj018";
rev = "1d22da687d36c37133b13f2b41658c1c989e77e0";
sha256 = "1mrdb8l4qpq39fbanwgk55mjhx55j8yif2h9bm4q6f0vqqs0n505";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -13537,12 +13549,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-12-09";
version = "2022-12-11";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "e61b0e2760e62a72a858e7e51733b52c22927dd3";
sha256 = "10i68hk8q8m6w9r7pmk4m18x6k931w6nl095452cag0ijc6rsxkd";
rev = "75b70f46770332e1bd51a4b0f2798a16b448e37b";
sha256 = "05jkbs77ffn9cpm8r005r208g6c03ammlmn7x62rlp25in4gyd0n";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};

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

@@ -238,12 +238,12 @@
};
diff = buildGrammar {
language = "diff";
version = "330eb64";
version = "1d63cd4";
source = fetchFromGitHub {
owner = "the-mikedavis";
repo = "tree-sitter-diff";
rev = "330eb648bbc257b4e91621e82a85372be7dde27a";
hash = "sha256-WK6pEUvIu6Xwsy5RuuUyNWLuSKkNkWh5R0hmyksIu8k=";
rev = "1d63cd49529ef3153393cf8f620718b274bba715";
hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk=";
};
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
};
@@ -1016,12 +1016,12 @@
};
php = buildGrammar {
language = "php";
version = "b4a8a60";
version = "64a2abb";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "b4a8a6048d66fcda4e8e4988bd0d9095980e303a";
hash = "sha256-Pm0FuY34eMhX4K7pbYpNAY1WYBOO+9cFCx/j992fsg8=";
rev = "64a2abb98a0cbf2bce23e4af6c05c78f06068886";
hash = "sha256-iAi+Cr7bW4mEbFHba+rv0afhY4v1suPGhsCK4IhcMLo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};

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

@@ -928,6 +928,7 @@ https://github.com/david-a-wheeler/vim-metamath/,,
https://github.com/xolox/vim-misc/,,
https://github.com/crusoexia/vim-monokai/,,
https://github.com/phanviet/vim-monokai-pro/,,
https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
https://github.com/matze/vim-move/,,
https://github.com/lifepillar/vim-mucomplete/,,
https://github.com/terryma/vim-multiple-cursors/,,

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

@@ -1567,8 +1567,8 @@ let
mktplcRef = {
name = "magit";
publisher = "kahole";
version = "0.6.18";
sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w";
version = "0.6.36";
sha256 = "sha256-4712BPibXJkkq0XEO9n0ZrdXAcID7IAabu/FOTiTeTo=";
};
meta = {
license = lib.licenses.mit;

6
pkgs/applications/emulators/duckstation/default.nix
View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation {
pname = "duckstation";
version = "unstable-2022-11-18";
version = "unstable-2022-12-08";
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b";
sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4=";
rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d";
sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg=";
};
nativeBuildInputs = [

4
pkgs/applications/graphics/drawio/default.nix
View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "20.6.1";
version = "20.6.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "8d1e3d44e53e62dd6dc7f231af5b682c9ff0e798a6480528444ba52cce02b4c9";
sha256 = "cf408c19622d7812b93f0f778b7f091a4387992f9d9a767f4bc1c417b61b7058";
};
nativeBuildInputs = [

1
pkgs/applications/graphics/tev/default.nix
View File

@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.unix;
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
maintainers = with maintainers; [ ];
};
}

144
pkgs/applications/maui/srcs.nix
View File

@@ -12,123 +12,139 @@
};
};
booth = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/booth/1.0.0/booth-1.0.0.tar.xz";
sha256 = "0cdn3vkbf1mlq32akz86mdyjfrq661h4jrfmp1x62ih63930hix2";
name = "booth-1.0.0.tar.xz";
url = "${mirror}/stable/maui/booth/1.0.1/booth-1.0.1.tar.xz";
sha256 = "02p3xxfk1fsqd8z55gmkhj68j8sjbgjyrj2anpq8qsmblznsvmdn";
name = "booth-1.0.1.tar.xz";
};
};
buho = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.2.0/buho-2.2.0.tar.xz";
sha256 = "1jj9kygh5b88ksg22969zlsrbgps6z7z2n77g6ldqzvg8mmh2cwr";
name = "buho-2.2.0.tar.xz";
url = "${mirror}/stable/maui/buho/2.2.1/buho-2.2.1.tar.xz";
sha256 = "1iv30avnfdh78zq7kxigxlkzdp2jfzx0sl88vssjcisniabyd1ri";
name = "buho-2.2.1.tar.xz";
};
};
clip = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.2.0/clip-2.2.0.tar.xz";
sha256 = "0ggymdscd7c942vvii3mswkq84lkygdcbvpg3s2lhqaqxpivy96z";
name = "clip-2.2.0.tar.xz";
url = "${mirror}/stable/maui/clip/2.2.1/clip-2.2.1.tar.xz";
sha256 = "00w9kgqw4dxb9b9rq11jzdb9pj48qdkdj23wdjwdk52nyfkw7sbh";
name = "clip-2.2.1.tar.xz";
};
};
communicator = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.2.0/communicator-2.2.0.tar.xz";
sha256 = "0njyjzf8w2aamrj1yajjw7551dc72db9m0iv14mnb0gcd9pphni7";
name = "communicator-2.2.0.tar.xz";
url = "${mirror}/stable/maui/communicator/2.2.1/communicator-2.2.1.tar.xz";
sha256 = "1h689dr9iy07r7ypyfgrb3n0ljigz847m6vq1jaia6phgix07hn6";
name = "communicator-2.2.1.tar.xz";
};
};
index-fm = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.2.0/index-fm-2.2.0.tar.xz";
sha256 = "0v39sfdqb21669cx96nd78vprwaxsvg3cpp3lly43n09nv6gkw41";
name = "index-fm-2.2.0.tar.xz";
url = "${mirror}/stable/maui/index/2.2.1/index-fm-2.2.1.tar.xz";
sha256 = "1gin3may65f8nafbgyv90k31z69xwx1awnnxmciqn5zz7cdh9slm";
name = "index-fm-2.2.1.tar.xz";
};
};
mauikit = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.2.0/mauikit-2.2.0.tar.xz";
sha256 = "05bvgwl1yfbfrlxhl6ngvkdk34rg4y12fsrddm8f19b6dkvjzxq2";
name = "mauikit-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit/2.2.1/mauikit-2.2.1.tar.xz";
sha256 = "0rwjd2g82j1cvspr0l889nss6p26yf19h39q20h3d9ls7fbj897h";
name = "mauikit-2.2.1.tar.xz";
};
};
mauikit-accounts = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.2.0/mauikit-accounts-2.2.0.tar.xz";
sha256 = "1wc67mhhmxq0dq1g10338zm52kx274yry2ja34kagva3qkbhbb2i";
name = "mauikit-accounts-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-accounts/2.2.1/mauikit-accounts-2.2.1.tar.xz";
sha256 = "13k9y7z9mw17rdn1z9ixgi1bf6q2hf0afp53nb8d9gz5mqkaf6qh";
name = "mauikit-accounts-2.2.1.tar.xz";
};
};
mauikit-calendar = {
version = "1.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-calendar/1.0.0/mauikit-calendar-1.0.0.tar.xz";
sha256 = "1zqaf0nddb220w14ar9gg6p695p0my8whn8p8wgxm7mwjfb6hlil";
name = "mauikit-calendar-1.0.0.tar.xz";
};
};
mauikit-documents = {
version = "1.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-documents/1.0.0/mauikit-documents-1.0.0.tar.xz";
sha256 = "1dniab7f113vbxng9b1nwmh6wviv1m1gb842k98vxgnhmsljq24a";
name = "mauikit-documents-1.0.0.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.0/mauikit-filebrowsing-2.2.0.tar.xz";
sha256 = "1377mgkx1q66jzdlra87airqkmkl9cfj6n5xw1my1nihxcjq9bz1";
name = "mauikit-filebrowsing-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.1/mauikit-filebrowsing-2.2.1.tar.xz";
sha256 = "1szghmp1p9pvsfqx8sk345j7riqxv2kib41l277rm14pwbs6zx1c";
name = "mauikit-filebrowsing-2.2.1.tar.xz";
};
};
mauikit-imagetools = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.0/mauikit-imagetools-2.2.0.tar.xz";
sha256 = "07clir651sfi4c9awv0jnq4pck2cfzfv0fdkwcapl6hh0zq9qvpr";
name = "mauikit-imagetools-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.1/mauikit-imagetools-2.2.1.tar.xz";
sha256 = "1wfhzkw4bs3518gylfxyp1arg2w204f73wg1l2s4pygbdh5ylav2";
name = "mauikit-imagetools-2.2.1.tar.xz";
};
};
mauikit-texteditor = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.0/mauikit-texteditor-2.2.0.tar.xz";
sha256 = "0x1cblydgqkhcy86x6yd8dipwhy9l5d7xlmk5igh5dllnzvcaicq";
name = "mauikit-texteditor-2.2.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.1/mauikit-texteditor-2.2.1.tar.xz";
sha256 = "0dzzlmdpl0y843lywfjc4za152r87kncafkmmbp8bdwc9j5fdzzv";
name = "mauikit-texteditor-2.2.1.tar.xz";
};
};
mauiman = {
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "${mirror}/stable/maui/mauiman/1.0.0/mauiman-1.0.0.tar.xz";
sha256 = "1risxzgjg684c8zwmwl03ihfrxx44lbb4j43v8z3wnjkq7p44w82";
name = "mauiman-1.0.0.tar.xz";
url = "${mirror}/stable/maui/mauiman/1.0.1/mauiman-1.0.1.tar.xz";
sha256 = "0awqb8kygacirlhha58bzgrd47zsxmfm3h5k68g8liymqn00fh30";
name = "mauiman-1.0.1.tar.xz";
};
};
nota = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.2.0/nota-2.2.0.tar.xz";
sha256 = "1nr8craafima1khkcxv47v1868yfwykjzaczlmmqmjha7bm1dlbd";
name = "nota-2.2.0.tar.xz";
url = "${mirror}/stable/maui/nota/2.2.1/nota-2.2.1.tar.xz";
sha256 = "1fl4w0l3l6rdgxw5w479nzbcff7rmdcxil7y6jdr8z2q50lkazj8";
name = "nota-2.2.1.tar.xz";
};
};
pix = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.2.0/pix-2.2.0.tar.xz";
sha256 = "0nghp69ax73yf0wybd724a3lgbj7jiiznnmwp67n2ls74q8yrwwy";
name = "pix-2.2.0.tar.xz";
url = "${mirror}/stable/maui/pix/2.2.1/pix-2.2.1.tar.xz";
sha256 = "0j2kpcxgdz21phdl0mx84ynalzf6bf3qalq524j7p297pdkrq3d6";
name = "pix-2.2.1.tar.xz";
};
};
shelf = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.2.0/shelf-2.2.0.tar.xz";
sha256 = "028ll3pi4h3jxgilsf4s5ic2rq0z9q8kh9pram9dsjvgz24p7g0c";
name = "shelf-2.2.0.tar.xz";
url = "${mirror}/stable/maui/shelf/2.2.1/shelf-2.2.1.tar.xz";
sha256 = "1h24mrzq5p63b11caml51az99gjipdlyrbx3na2jsxy4rvzryddm";
name = "shelf-2.2.1.tar.xz";
};
};
station = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.2.0/station-2.2.0.tar.xz";
sha256 = "0za3jh5clkx8xf436vzs83nrsw5fyna4wcy73ihlf3xbra0358v1";
name = "station-2.2.0.tar.xz";
url = "${mirror}/stable/maui/station/2.2.1/station-2.2.1.tar.xz";
sha256 = "1ch5c4728hahh90nlpqwnlaljpingvwrjwxajan1j2kgwb5lynwz";
name = "station-2.2.1.tar.xz";
};
};
strike = {
@@ -140,11 +156,11 @@
};
};
vvave = {
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.2.0/vvave-2.2.0.tar.xz";
sha256 = "0qnwklc875j6g2rg610dmvcizg3m4q80fhjk4c3i1xzn8dybbg5s";
name = "vvave-2.2.0.tar.xz";
url = "${mirror}/stable/maui/vvave/2.2.1/vvave-2.2.1.tar.xz";
sha256 = "0mg4p44da16xkcra1akvh6f2fixd682clmd6wqgc34j7n1a9y773";
name = "vvave-2.2.1.tar.xz";
};
};
}

16
pkgs/applications/misc/dasel/default.nix
View File

@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dasel";
version = "1.27.3";
version = "2.0.2";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-VrdjP9HlaBg8GY+2HPkQDwqJsoFtzTMz9QtQxhrUdxw=";
sha256 = "sha256-VdOXmhfgDzMyspoCFQl64obpQph14XZxR0Nas+crelA=";
};
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";
vendorSha256 = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
@@ -22,13 +22,15 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then
echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red
echo '${pname} smoke check passed'
runHook preInstallCheck
if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then
echo '{ "my": { "favourites": { "colour": "blue" } } }' \
| $out/bin/dasel put -t json -r json -t string -v "red" "my.favourites.colour" \
| grep "red"
else
echo '${pname} smoke check failed'
return 1
fi
runHook postInstallCheck
'';
meta = with lib; {

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

@@ -6,14 +6,14 @@
mkDerivation rec {
pname = "edgetx";
version = "2.7.1";
version = "2.7.2";
src = fetchFromGitHub {
owner = "EdgeTX";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-1l5EoDY17+2PDS3eRT3CHksVoZQgNLV9vRDu7nfzlrE=";
sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
};
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

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

@@ -22,14 +22,14 @@
}:
mkDerivation rec {
version = "1.3.0";
version = "1.3.1";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "sha256-uhVRO9aiYJbUmwDp1+LIYF3wNBbVduVpTtVzaS0oUMU=";
sha256 = "sha256-0rmfDkPvgubVqfbIOZ+mnv/x1p2sb88zGeg/Q2JCy3I=";
};
patches = [

13
pkgs/applications/networking/browsers/offpunk/default.nix
View File

@@ -1,5 +1,5 @@
{
fetchFromGitea,
fetchFromSourcehut,
less,
lib,
makeWrapper,
@@ -31,14 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "offpunk";
version = "1.7.1";
version = "1.8";
src = fetchFromGitea {
domain = "notabug.org";
owner = "ploum";
src = fetchFromSourcehut {
owner = "~lioploum";
repo = "offpunk";
rev = "v${finalAttrs.version}";
sha256 = "1y1xb1ccsprl0xkn4hlh09j8y5xpdn6r860xlrmk12wfk2xrfbfy";
sha256 = "0xv7b3qkwyq55sz7c0v0pknrpikhzyqgr5y4y30cwa7jd8sn423f";
};
nativeBuildInputs = [ makeWrapper ];
@@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "An Offline-First browser for the smolnet ";
homepage = "https://notabug.org/ploum/offpunk";
homepage = finalAttrs.src.meta.homepage;
maintainers = with maintainers; [ DamienCassou ];
platforms = platforms.linux;
license = licenses.bsd2;

8
pkgs/applications/networking/cluster/nixops/default.nix
View File

@@ -69,6 +69,14 @@ let
};
})
(self: super: {
certifi = super.certifi.overridePythonAttrs (old: {
meta = old.meta // {
knownVulnerabilities = [ "CVE-2022-23491" ];
};
});
})
];
}
).python;

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

@@ -167,13 +167,13 @@
"vendorHash": null
},
"bitbucket": {
"hash": "sha256-tT5JSiUPeezQFn4tnKrsUxfm/llaBk8R2eOGqGIbEH4=",
"hash": "sha256-NPcAYceokJHqfQU/cx9S2c8riFbU2tTTJEuHXPPP+eE=",
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
"owner": "DrFaust92",
"repo": "terraform-provider-bitbucket",
"rev": "v2.23.0",
"rev": "v2.24.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-CFRZSdQnbhV7n10r2R1+cGxn7nKD+GvXWf85rYFRPVI="
"vendorHash": "sha256-Db8mo4XOjWi3n8Ni94f4/urWkU3/WfEVQsmXEGFmpQI="
},
"brightbox": {
"hash": "sha256-F/AQq45ADM0+PbFpMPtpMvbYw8F41GDBzk7LoY/L/Qg=",

13
pkgs/applications/science/math/primecount/default.nix
View File

@@ -7,18 +7,22 @@
stdenv.mkDerivation rec {
pname = "primecount";
version = "7.4";
version = "7.6";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primecount";
rev = "v${version}";
hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y=";
hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
];
buildInputs = [ primesieve ];
buildInputs = [
primesieve
];
cmakeFlags = [
"-DBUILD_LIBPRIMESIEVE=ON"
@@ -30,6 +34,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/kimwalisch/primecount";
changelog = "https://github.com/kimwalisch/primecount/blob/v${version}/ChangeLog";
description = "Fast prime counting function implementations";
longDescription = ''
primecount is a command-line program and C/C++ library that counts the

5
pkgs/applications/science/math/primesieve/default.nix
View File

@@ -6,19 +6,20 @@
stdenv.mkDerivation rec {
pname = "primesieve";
version = "8.0";
version = "11.0";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${version}";
hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM=";
hash = "sha256-mYekOfjeGwQzWi3pBXnmRMTV7nghEvHsD+tR7vrTFRY=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
homepage = "https://primesieve.org/";
changelog = "https://github.com/kimwalisch/primesieve/blob/v${version}/ChangeLog";
description = "Fast C/C++ prime number generator";
longDescription = ''
primesieve is a command-line program and C/C++ library for quickly

20
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
View File

@@ -1,27 +1,35 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, libiconv, Security
, pkg-config, openssl
, libiconv
, Security
, pkg-config
, openssl
, testers
, git-workspace
}:
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
version = "1.0.3";
version = "1.1.0";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sPvb8EKrr9ZUMV1yMTXkFYgjW+LRJwJAXoc7lrWykaI=";
sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI=";
};
cargoSha256 = "sha256-WAoYFCJCWKFvWN8XyRBZdzjCrcR6jMp8ZztSLHDP+r0=";
cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];
passthru.tests.version = testers.testVersion { package = git-workspace; };
meta = with lib; {
description = "Sync personal and work git repositories from multiple providers";
homepage = "https://github.com/orf/git-workspace";

41
pkgs/applications/window-managers/jay/default.nix Normal file
View File

@@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, libinput
, libxkbcommon
, mesa
, pango
, udev
}:
rustPlatform.buildRustPackage rec {
pname = "jay";
version = "unstable-2022-11-20";
src = fetchFromGitHub {
owner = "mahkoh";
repo = pname;
rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2";
sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw=";
};
cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU=";
buildInputs = [
libxkbcommon
mesa
pango
udev
libinput
];
RUSTC_BOOTSTRAP = 1;
meta = with lib; {
description = "A Wayland compositor written in Rust";
homepage = "https://github.com/mahkoh/jay";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dit7ya ];
};
}

2
pkgs/desktops/gnome/core/zenity/default.nix
View File

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool to display dialogs from the commandline and shell scripts";
homepage = "https://wiki.gnome.org/Projects/Zenity";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}

10
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, appstream
, desktop-file-utils
@@ -36,6 +37,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI=";
};
patches = [
# Fix drag and drop of accented text and between tabs
# https://github.com/elementary/code/pull/1194
(fetchpatch {
url = "https://github.com/elementary/code/commit/1ed7b590768ea9cb5b4658e27d9dc7ac224442ae.patch";
sha256 = "sha256-VrYcEbkzQKi5gFB/Vw/0NITZvSXKXfuEv2R3m0VALVM=";
})
];
nativeBuildInputs = [
appstream
desktop-file-utils

32
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View File

@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
@@ -19,42 +18,15 @@
stdenv.mkDerivation rec {
pname = "elementary-music";
version = "7.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "music";
rev = version;
sha256 = "sha256-fZbOjZd6udJWM+jWXCmGwt6cyl/lXPsgM9XeTScbqts=";
sha256 = "sha256-PttmC1Z3rX2XWCECc320HMs692hSBsxkmnh1Q8a/Mg8=";
};
patches = [
# Use file basename for fallback audio object title
# https://github.com/elementary/music/pull/710
(fetchpatch {
url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch";
sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w=";
})
# Skip invalid files instead of stopping playback
# https://github.com/elementary/music/pull/711
(fetchpatch {
url = "https://github.com/elementary/music/commit/88f332197d2131daeff3306ec2a484a28fa4db21.patch";
sha256 = "sha256-Zga0UmL1PAq4P58IjOuEiXGGn187a0/LHbXXze4sSpY=";
})
# Enable the NEXT button if repeat mode is set to ALL or ONE
# https://github.com/elementary/music/pull/712
(fetchpatch {
url = "https://github.com/elementary/music/commit/3249e3ca247dfd5ff6b14f4feeeeed63b435bcb8.patch";
sha256 = "sha256-nx/nlSSRxu4wy8QG5yYBi0BdRoUmnyry7mwzuk5NJxU=";
})
# Hard code GTK styles
# https://github.com/elementary/music/pull/723
(fetchpatch {
url = "https://github.com/elementary/music/commit/4e22268d38574e56eb3b42ae201c99cc98b510db.patch";
sha256 = "sha256-DZds7pg0vYL9vga+tP7KJHcjQTmdKHS+D+q/2aYfMmk=";
})
];
nativeBuildInputs = [
meson
ninja

4
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View File

@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.8.4";
version = "2.9.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "videos";
rev = version;
sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw=";
sha256 = "sha256-QQcuhYe3/ZMqQEFJS72+vr1AzJC9Y7mr5Fa5yFsNYIc=";
};
nativeBuildInputs = [

8
pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
View File

@@ -13,19 +13,19 @@
, libgee
, libhandy
, gcr
, webkitgtk
, webkitgtk_4_1
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "capnet-assist";
rev = version;
sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw=";
sha256 = "sha256-06DWkLkVpdSYnKOR8zqA0tvWXYrglBM9R/XEIfIkwQU=";
};
nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
gtk3
libgee
libhandy
webkitgtk
webkitgtk_4_1
];
postPatch = ''

6
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }:
{ lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }:
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fcommon";
prefixKey = "-prefix ";
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper;
buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
CAT=$(type -tp cat)

4
pkgs/development/libraries/LAStools/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "LAStools";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "LAStools";
repo = "LAStools";
rev = "v${version}";
sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU=";
sha256 = "sha256-HL64koe0GNzJzyA0QP4I0M1y2HSxigsZTqOw67RCwNc=";
};
patches = [

5
pkgs/development/libraries/httplib/default.nix
View File

@@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "httplib";
version = "0.11.1";
version = "0.11.3";
src = fetchFromGitHub {
owner = "yhirose";
repo = "cpp-httplib";
rev = "v${version}";
sha256 = "sha256-rsElqtoRz/sOXpAsfSJbMlwIKdaGJkSZfKHzB/wMhY8=";
hash = "sha256-gly0AQ2DCZJQCAPQL5Xsc/kTvFK2twIDbHwbjvrW+P4=";
};
# Header-only library.
@@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
description = "A C++ header-only HTTP/HTTPS server and client library";
homepage = "https://github.com/yhirose/cpp-httplib";
changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}";
maintainers = with maintainers; [ aidalgol ];
license = licenses.mit;
};

6
pkgs/development/lua-modules/nfd/default.nix
View File

@@ -1,5 +1,5 @@
{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity }:
{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib
, substituteAll, zenity, AppKit }:
buildLuarocksPackage {
pname = "nfd";
@@ -25,6 +25,8 @@ buildLuarocksPackage {
extraVariables.LUA_LIBDIR = "${lua}/lib";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
fixupPhase = ''
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
'';

2
pkgs/development/ocaml-modules/piqi/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
patches = [ ./no-ocamlpath-override.patch ];
patches = [ ./no-stream.patch ./no-ocamlpath-override.patch ];
createFindlibDestdir = true;

14
pkgs/development/ocaml-modules/piqi/no-stream.patch Normal file
View File

@@ -0,0 +1,14 @@
--- ./piqilib/piq_lexer.ml
+++ ./piqilib/piq_lexer.ml
@@ -476,11 +476,6 @@ let init_from_string s =
make_buf lexbuf
-let init_from_stream s =
- let lexbuf = Sedlexing.Utf8.from_stream s in
- make_buf lexbuf
-
-
let init_from_channel ch =
let lexbuf = Sedlexing.Utf8.from_channel ch in
make_buf lexbuf

4
pkgs/development/ocaml-modules/sedlex/default.nix
View File

@@ -10,8 +10,8 @@
let param =
if lib.versionAtLeast ppxlib.version "0.26.0" then {
version = "2.6";
sha256 = "sha256-AU+dV+jTG9v3BXzip2Bnv04Ewyo3pyUglDDBFsOsFf0=";
version = "3.0";
sha256 = "sha256-+4ggynMznVfjviMBjXil8CXdMByq4kSmDz6P2PyEETA=";
} else {
version = "2.5";
sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy";

7
pkgs/development/python-modules/apache-beam/default.nix
View File

@@ -62,6 +62,13 @@ buildPythonPackage rec {
hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk=";
stripLen = 2;
})
(fetchpatch {
# https://github.com/apache/beam/pull/24573
name = "relax-httplib2-version.patch";
url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch";
hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek=";
stripLen = 2;
})
];
pythonRelaxDeps = [

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

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, attrs
, argon2-cffi
, base58
@@ -53,6 +54,14 @@ buildPythonPackage rec {
disabled = pythonOlder "3.7";
patches = [
(fetchpatch {
# https://github.com/crossbario/autobahn-python/pull/1604
url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch";
sha256 = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k=";
})
];
src = fetchPypi {
inherit pname version;
sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k=";

20
pkgs/development/python-modules/bitstring/default.nix
View File

@@ -1,33 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
, setuptools
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "bitstring";
version = "3.1.9";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "scott-griffiths";
repo = pname;
rev = "bitstring-${version}";
sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa";
hash = "sha256-eHP20F9PRe9ZNXjcDcsI3iFVswA6KtRWhBMAT7dkCv0=";
};
patches = [
(fetchpatch {
name = "fix-running-unit-tests-using-unittest-hook.patch";
url = "https://github.com/scott-griffiths/bitstring/commit/e5ee3fd41cad2ea761f4450b13b0424ae7262331.patch";
hash = "sha256-+ZGywIfQQcYXJlYZBi402ONnysYm66G5zE4duJE40h8=";
})
nativeBuildInputs = [
setuptools
];
checkInputs = [ unittestCheckHook ];
unittestFlagsArray = [ "-s" "test" ];
pythonImportsCheck = [ "bitstring" ];
meta = with lib; {

38
pkgs/development/python-modules/calver/default.nix
View File

@@ -1,24 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, fetchFromGitHub
, pretend
, pytestCheckHook
}:
let
buildPythonPackage rec {
pname = "calver";
version = "2022.6.26";
version = "2022.06.26";
in
buildPythonPackage {
inherit pname version;
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s=";
format = "setuptools";
src = fetchFromGitHub {
owner = "di";
repo = "calver";
rev = version;
hash = "sha256-YaXTkeUazwzghCX96Wfx39hGvukWKtHMLLeyF9OeiZI=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=calver_version(True)" 'version="${version}"'
'';
checkInputs = [
pretend
pytestCheckHook
];
pythonImportsCheck = [ "calver" ];
meta = {
description = "Setuptools extension for CalVer package versions";
homepage = "https://github.com/di/calver";
license = lib.licenses.asl20;
maintainers = [ ];
maintainers = with lib.maintainers; [ dotlambda ];
};
}

69
pkgs/development/python-modules/databricks-cli/default.nix
View File

@@ -1,42 +1,65 @@
{ lib, buildPythonPackage, fetchPypi
{ lib
, buildPythonPackage
, click
, oauthlib
, requests
, tabulate
, six
, configparser
, pytest
, decorator
, fetchFromGitHub
, mock
, oauthlib
, pyjwt
, pytestCheckHook
, pythonOlder
, requests
, requests-mock
, six
, tabulate
}:
buildPythonPackage rec {
pname = "databricks-cli";
version = "0.17.3";
version = "0.17.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LwDz5w6FmAnwWViF7Hb8c7pgrQzM1pVk999dlbbJAGY=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "databricks";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-srrNxiOGrU1u5shssRssr8Hwdy20U4coOAjYsT7eTSA=";
};
checkInputs = [
pytest
];
checkPhase = "pytest tests";
# tests folder is missing in PyPI
doCheck = false;
propagatedBuildInputs = [
click
oauthlib
requests
tabulate
six
configparser
oauthlib
pyjwt
requests
requests-mock
six
tabulate
];
checkInputs = [
decorator
mock
pytestCheckHook
];
disabledTestPaths = [
# Disabled due to option parsing which we don't have
"integration/dbfs/test_integration.py"
"integration/workspace/test_integration.py"
];
pythonImportsCheck = [
"databricks_cli"
];
meta = with lib; {
description = "Command line interface for Databricks";
homepage = "https://github.com/databricks/databricks-cli";
description = "A command line interface for Databricks";
changelog = "https://github.com/databricks/databricks-cli/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ tbenst ];
};

4
pkgs/development/python-modules/diff-cover/default.nix
View File

@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "diff-cover";
version = "7.2.0";
version = "7.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "diff_cover";
inherit version;
hash = "sha256-MJvP3bwTZQsSFGIlLz9pZ6wZaBb4uR6WWi4MAroVzJI=";
hash = "sha256-qbHyu9FJYs1Sedc1ijuo1ya5pswD2/QJ+JzCB2pCQjQ=";
};
propagatedBuildInputs = [

48
pkgs/development/python-modules/dnfile/default.nix Normal file
View File

@@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pefile
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dnfile";
version = "0.12.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "malwarefrank";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-r3DupEyMEXOFeSDo9k0LmGM/TGMbbpVW7zCoUA4oG8Y=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
pefile
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dnfile"
];
meta = with lib; {
description = "Module to parse .NET executable files";
homepage = "hhttps://github.com/malwarefrank/dnfile";
changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "fontMath";
version = "0.9.2";
version = "0.9.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TIsccR4cv0upPD0IQ5NbBmGXMTEmGvCGCL3hfeEBhAQ=";
sha256 = "sha256-alOHy3/rEFlY2y9c7tyHhRPMNb83FeJiCQ8FV74MGxw=";
extension = "zip";
};

5
pkgs/development/python-modules/graphene/default.nix
View File

@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "graphene";
version = "3.1.1";
version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = "graphene";
rev = "refs/tags/v${version}";
sha256 = "sha256-04ocm/Q/CDi5dRNhReuvr5nAiowMZUJrZol/wJOjG50=";
hash = "sha256-2o/IR6XjnS57D4ZjADrcI18acfJ+Q0zdnXeb5ZeCpM4=";
};
propagatedBuildInputs = [
@@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "GraphQL Framework for Python";
homepage = "https://github.com/graphql-python/graphene";
changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};

4
pkgs/development/python-modules/hg-evolve/default.nix
View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
version = "10.5.2";
version = "10.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-45FOAQDJgAfhlTF/XBmIfvmMM1X7LUzsHAb7NMQl9Fs=";
sha256 = "sha256-0frkG8HqzC1ZftGDMv4vk47vc9tQWGBQbL4bzFdaCL4=";
};
checkInputs = [

7
pkgs/development/python-modules/home-assistant-bluetooth/default.nix
View File

@@ -11,15 +11,16 @@
buildPythonPackage rec {
pname = "home-assistant-bluetooth";
version = "1.8.1";
version = "1.9.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-oOrsZmAXLYsJ19DrQ70O0RpeSz8Jn8oD41Tsc5DVUng=";
hash = "sha256-/ne2pnSmeHuwlGCrMC0x/yNDCvB/P4SqmK/wwcmHlJQ=";
};
postPatch = ''
@@ -47,7 +48,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Basic bluetooth models used by Home Assistant";
changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/main/CHANGELOG.md";
changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth";
license = licenses.asl20;
maintainers = teams.home-assistant.members;

16
pkgs/development/python-modules/malduck/default.nix
View File

@@ -3,18 +3,20 @@
, capstone
, click
, cryptography
, dnfile
, fetchFromGitHub
, pefile
, pycryptodomex
, pyelftools
, pythonOlder
, pytestCheckHook
, typing-extensions
, yara-python
}:
buildPythonPackage rec {
pname = "malduck";
version = "4.2.0";
version = "4.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -23,13 +25,14 @@ buildPythonPackage rec {
owner = "CERT-Polska";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM=";
hash = "sha256-1gwJhlhRLnh01AIJj07Wpba8X7V5AfACuJmZX+cfT6Y=";
};
propagatedBuildInputs = [
capstone
click
cryptography
dnfile
pefile
pycryptodomex
pyelftools
@@ -39,11 +42,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "pefile==2019.4.18" "pefile"
--replace "pefile==2019.4.18" "pefile" \
--replace "dnfile==0.11.0" "dnfile"
'';
# Project has no tests. They will come with the next release
doCheck = false;
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"malduck"
@@ -52,6 +57,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Helper for malware analysis";
homepage = "https://github.com/CERT-Polska/malduck";
changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};

25
pkgs/development/python-modules/notify-py/default.nix
View File

@@ -1,12 +1,14 @@
{ lib
, stdenv
, buildPythonPackage
, isPy3k
, pythonOlder
, fetchFromGitHub
, substituteAll
, alsa-utils
, libnotify
, which
, poetry-core
, pythonRelaxDepsHook
, jeepney
, loguru
, pytest
@@ -16,15 +18,17 @@
buildPythonPackage rec {
pname = "notify-py";
version = "0.3.3";
version = "0.3.38";
disabled = !isPy3k;
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "ms7m";
repo = pname;
rev = "v${version}";
sha256 = "1n35adwsyhz304n4ifnsz6qzkymwhyqc8sg8d76qv5psv2xsnzlf";
hash = "sha256-wlA7a10f4PYP3dYYwZqMULQ5FMCXpOUOTxXzEEVZCsI=";
};
patches = lib.optionals stdenv.isLinux [
@@ -42,6 +46,15 @@ buildPythonPackage rec {
})
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"loguru"
];
propagatedBuildInputs = [
loguru
] ++ lib.optionals stdenv.isLinux [
@@ -67,6 +80,10 @@ buildPythonPackage rec {
pytest
'';
# GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name
# org.freedesktop.Notifications was not provided by any .service files
doCheck = false;
pythonImportsCheck = [ "notifypy" ];
meta = with lib; {

64
pkgs/development/python-modules/notify-py/linux-paths.patch
View File

@@ -1,54 +1,22 @@
diff --git a/notifypy/os_notifiers/linux.py b/notifypy/os_notifiers/linux.py
index ee89216..5201574 100644
index 5882481..e26eaaf 100644
--- a/notifypy/os_notifiers/linux.py
+++ b/notifypy/os_notifiers/linux.py
@@ -53,30 +53,12 @@ class LinuxNotifierLibNotify(BaseNotifier):
@staticmethod
def _find_installed_aplay():
"""Function to find the path for notify-send"""
- try:
- run_which_for_aplay = subprocess.check_output(["which", "aplay"])
- return run_which_for_aplay.decode("utf-8")
- except subprocess.CalledProcessError:
- logger.exception("Unable to find aplay.")
- return False
- except Exception:
- logger.exception("Unhandled exception for finding aplay.")
- return False
+ return "@aplay@"
@@ -10,7 +10,7 @@ try:
from jeepney.io.blocking import open_dbus_connection
from shutil import which
@staticmethod
def _find_installed_notify_send():
"""Function to find the path for notify-send"""
- try:
- run_which_for_notify_send = subprocess.check_output(
- ["which", "notify-send"]
- )
- return run_which_for_notify_send.decode("utf-8")
- except subprocess.CalledProcessError:
- logger.exception("Unable to find notify-send.")
- return False
- except Exception:
- logger.exception("Unhandled exception for finding notify-send.")
- return False
+ return "@notifysend@"
- NOTIFY = which('notify-send') # alternatively: from ctypes.util import find_library
+ NOTIFY = '@notifysend@' # alternatively: from ctypes.util import find_library
def send_notification(
self,
@@ -159,15 +141,7 @@ class LinuxNotifier(BaseNotifier):
@staticmethod
def _find_installed_aplay():
"""Function to find the path for notify-send"""
- try:
- run_which_for_aplay = subprocess.check_output(["which", "aplay"])
- return run_which_for_aplay.decode("utf-8")
- except subprocess.CalledProcessError:
- logger.exception("Unable to find aplay.")
- return False
- except Exception:
- logger.exception("Unhandled exception for finding aplay.")
- return False
+ return "@aplay@"
if NOTIFY:
logger.info("libnotify found, using it for notifications")
@@ -22,7 +22,7 @@ try:
else:
raise ImportError
def send_notification(
self,
- APLAY = which('aplay')
+ APLAY = '@aplay@'
if APLAY == None:
logger.debug("aplay binary not installed.. audio will not work!")

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

@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "13.0.1";
version = "13.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
hash = "sha256-IDqvA3r7rKEnY6OpEZKd0lsKinse4A0BDTQ5vTGpglI=";
hash = "sha256-G1IOR3SSzY/gIuTQQeZ2BW1f/7tsBbL0UJgBoGvGe+w=";
};
postPatch = ''

30
pkgs/development/python-modules/python-benedict/default.nix
View File

@@ -1,26 +1,30 @@
{ lib
, aiohttp
, boto3
, buildPythonPackage
, fetchFromGitHub
, ftfy
, mailchecker
, openpyxl
, orjson
, phonenumbers
, pytestCheckHook
, python-dateutil
, python-decouple
, python-fsutil
, pythonOlder
, python-slugify
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
, requests
, six
, toml
, xlrd
, xmltodict
}:
buildPythonPackage rec {
pname = "python-benedict";
version = "0.25.4";
version = "0.27.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -29,25 +33,37 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4=";
hash = "sha256-L1lgP/Lpy+3koT93Z/H27SbraOHXBm1pxx+Ie6Z2AE4=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"boto3"
];
propagatedBuildInputs = [
boto3
ftfy
mailchecker
openpyxl
phonenumbers
python-dateutil
python-fsutil
python-slugify
pyyaml
ftfy
orjson
requests
toml
xlrd
xmltodict
];
checkInputs = [
orjson
pytestCheckHook
python-decouple
six
];
@@ -59,6 +75,7 @@ buildPythonPackage rec {
"test_from_plist_with_valid_url_valid_content"
"test_from_query_string_with_valid_url_valid_content"
"test_from_toml_with_valid_url_valid_content"
"test_from_xls_with_valid_url_valid_content"
"test_from_xml_with_valid_url_valid_content"
"test_from_yaml_with_valid_url_valid_content"
];
@@ -70,6 +87,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module with keylist/keypath support";
homepage = "https://github.com/fabiocaccamo/python-benedict";
changelog = "https://github.com/fabiocaccamo/python-benedict/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

39
pkgs/development/python-modules/python-decouple/default.nix Normal file
View File

@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-decouple";
version = "3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "HBNetwork";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Ll0MZb4FaNFF/jvCfj4TkuoAi4m448KaOU3ykvKPbSo=";
};
checkInputs = [
mock
pytestCheckHook
];
pythonImportsCheck = [
"decouple"
];
meta = with lib; {
description = "Module to handle code and condifuration";
homepage = "https://github.com/HBNetwork/python-decouple";
changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/python-modules/toggl-cli/default.nix
View File

@@ -57,7 +57,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "notify-py==0.3.1" "notify-py>=0.3.1" \
--replace "notify-py==0.3.3" "notify-py>=0.3.3" \
--replace "click==8.0.3" "click>=8.0.3" \
--replace "pbr==5.8.0" "pbr>=5.8.0" \
--replace "inquirer==2.9.1" "inquirer>=2.9.1"

22
pkgs/development/python-modules/vdirsyncer/default.nix
View File

@@ -7,25 +7,30 @@
, click-threading
, requests-toolbelt
, requests
, requests-oauthlib
, atomicwrites
, hypothesis
, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools-scm
, aiostream
, aiohttp
, pytest-asyncio
, trustme
, aioresponses
, vdirsyncer
, testers
}:
buildPythonPackage rec {
pname = "vdirsyncer";
version = "0.18.0";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE=";
hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf";
};
postPatch = ''
@@ -41,8 +46,9 @@ buildPythonPackage rec {
click-log
click-threading
requests
requests-oauthlib
requests-toolbelt
aiostream
aiohttp
];
nativeBuildInputs = [
@@ -52,8 +58,10 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytestCheckHook
pytest-localserver
pytest-subtesthack
pytest-asyncio
trustme
aioresponses
];
preCheck = ''
@@ -66,6 +74,8 @@ buildPythonPackage rec {
"test_verbosity"
];
passthru.tests.version = testers.testVersion { package = vdirsyncer; };
meta = with lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";

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

@@ -8,15 +8,15 @@
buildPythonPackage rec {
pname = "wakeonlan";
version = "2.1.0";
version = "3.0.0";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "remcohaszing";
repo = "pywakeonlan";
rev = version;
sha256 = "sha256-5ri4bXc0EMNntzmcUZYpRIfaXoex4s5M6psf/9ta17Y=";
rev = "refs/tags/${version}";
sha256 = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo=";
};
nativeBuildInputs = [

4
pkgs/development/tools/altair-graphql-client/default.nix
View File

@@ -2,11 +2,11 @@
let
pname = "altair";
version = "5.0.5";
version = "5.0.9";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-dBIY7VINBI7hPTzkdPEq2iwWMNkpr6aVfVTHQR2eZ0w=";
sha256 = "sha256-7eodAj48MMmdLEZPbYlhsgM01NEm0HxRTiIPPtlxdrA=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

4
pkgs/development/tools/continuous-integration/github-runner/default.nix
View File

@@ -263,8 +263,8 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux ''
# Make binary paths absolute
substituteInPlace $out/lib/config.sh \
--replace 'ldd' '${glibc}/bin/ldd' \
--replace '/sbin/ldconfig' '${glibc}/bin/ldconfig'
--replace 'ldd' '${glibc.bin}/bin/ldd' \
--replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
'' + ''
# Remove uneeded copy for run-helper template
substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '

8
pkgs/development/tools/database/trino-cli/default.nix
View File

@@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec {
pname = "trino-cli";
version = "392";
version = "403";
jarfilename = "${pname}-${version}-executable.jar";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s=";
sha256 = "sha256-Yo7WQoY99gbXflcms0v3r9w+GXSNOP+CdKDnUZXEs8Q=";
};
dontUnpack = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
install -D "$src" "$out/share/java/${jarfilename}"
makeWrapper ${jre}/bin/java $out/bin/trino \
makeWrapper ${jre_headless}/bin/java $out/bin/trino \
--add-flags "-jar $out/share/java/${jarfilename}"
runHook postInstall

6
pkgs/development/tools/kube-linter/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-linter";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "stackrox";
repo = pname;
rev = version;
sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U=";
sha256 = "sha256-FEiUnJFmrHj97aSjfJtsjS9Qy4A6mzXicIrJZdgZbag=";
};
vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8=";
vendorSha256 = "sha256-5dsM5jfD/apRs5NT/XqM8eHEgiyGQHHG3MG6cOFQKr8=";
ldflags = [
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"

4
pkgs/development/tools/open-policy-agent/default.nix
View File

@@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.47.0";
version = "0.47.2";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
sha256 = "sha256-aN/3xJFAc4r1nXF01tz4G4lP1KEQZQ3y+QuJ+wToD6M=";
sha256 = "sha256-OAL7sYR4SFFQbRhVTx3NAQiDTr5l/4ejtFTVnT1idCU=";
};
vendorSha256 = null;

2
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View File

@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.38.0";
version = "1.39.1";
inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;

1
pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
View File

@@ -165,6 +165,7 @@ pythonPackages.callPackage
(
builtins.fetchGit ({
inherit (source) url;
submodules = true;
rev = source.resolved_reference or source.reference;
ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
} // (

20
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View File

@@ -2938,6 +2938,9 @@
"cometblue-lite": [
"setuptools"
],
"comm": [
"hatchling"
],
"commandparse": [
"setuptools"
],
@@ -9892,7 +9895,8 @@
"setuptools"
],
"packaging": [
"setuptools"
"setuptools",
"flit-core"
],
"packbits": [
"setuptools"
@@ -14254,7 +14258,9 @@
"setuptools"
],
"rapidfuzz": [
"setuptools"
"setuptools",
"packaging",
"scikit-build"
],
"rapidfuzz-capi": [
"setuptools"
@@ -14949,7 +14955,8 @@
"setuptools-scm"
],
"scikit-image": [
"cython"
"cython",
"setuptools"
],
"scikit-learn": [
"cython",
@@ -16893,6 +16900,9 @@
"trimesh": [
"setuptools"
],
"trino": [
"setuptools"
],
"trio": [
"setuptools"
],
@@ -16905,6 +16915,10 @@
"troposphere": [
"setuptools"
],
"trove-classifiers": [
"setuptools",
"calver"
],
"trueskill": [
"setuptools"
],

50
pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
View File

@@ -390,7 +390,7 @@ lib.composeManyExtensions [
scrypto =
if isWheel then
(
super.cryptography.override { preferWheel = true; }
super.cryptography.overridePythonAttrs { preferWheel = true; }
) else super.cryptography;
in
scrypto.overridePythonAttrs
@@ -1324,9 +1324,10 @@ lib.composeManyExtensions [
open3d = super.open3d.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ];
buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.udev
pkgs.libusb1
] ++ (if lib.versionAtLeast super.open3d.version "0.16.0" then [
] ++ lib.optionals stdenv.isLinux [
pkgs.udev
] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [
pkgs.mesa
(
pkgs.symlinkJoin {
@@ -1341,15 +1342,35 @@ lib.composeManyExtensions [
)
];
})
] else [ ]);
];
# Patch the dylib in the binary distribution to point to the nix build of libomp
preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") ''
install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so
'';
# TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
autoPatchelfIgnoreMissingDeps = true;
});
# Overrides for building packages based on OpenCV
# These flags are inspired by the opencv 4.x package in nixpkgs
_opencv-python-override =
old: {
# Disable OpenCL on macOS
# Can't use cmakeFlags because cmake is called by setup.py
CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF";
nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
buildInputs = [
self.scikit-build
] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
AVFoundation
Cocoa
CoreMedia
MediaToolbox
VideoDecodeAcceleration
]) ++ (old.buildInputs or [ ]);
dontUseCmakeConfigure = true;
};
@@ -1357,13 +1378,7 @@ lib.composeManyExtensions [
opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override;
opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs (
old: {
nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
dontUseCmakeConfigure = true;
}
);
opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override;
openexr = super.openexr.overridePythonAttrs (
old: {
@@ -1775,6 +1790,13 @@ lib.composeManyExtensions [
++ [ pkgs.freetds ];
});
pyopencl = super.pyopencl.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ];
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ];
}
);
pyopenssl = super.pyopenssl.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
@@ -2705,6 +2727,10 @@ lib.composeManyExtensions [
'if True:'
'';
});
mkdocs = super.mkdocs.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ];
});
}
)

3
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix
View File

@@ -52,8 +52,5 @@ poetry2nix.mkPoetryApplication {
meta = with lib; {
inherit (python.meta) platforms;
maintainers = with maintainers; [ adisbladis jakewaksbaum ];
knownVulnerabilities = [
"CVE-2022-42966" # cleo version in poetry.lock is vulnerable
];
};
}

860
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

42
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "poetry"
version = "1.2.2"
version = "1.3.0"
description = "Python dependency management and packaging made easy."
authors = [
"Sébastien Eustace <sebastien@eustace.io>",
@@ -37,6 +37,9 @@ classifiers = [
"Topic :: Software Development :: Libraries :: Python Modules"
]
[tool.poetry.urls]
Changelog = "https://python-poetry.org/history/"
[tool.poetry.build]
generate-setup-file = false
@@ -44,39 +47,46 @@ generate-setup-file = false
[tool.poetry.dependencies]
python = "^3.7"
poetry-core = "1.3.2"
poetry-plugin-export = "^1.1.2"
poetry-core = "1.4.0"
poetry-plugin-export = "^1.2.0"
"backports.cached-property" = { version = "^1.0.2", python = "<3.8" }
cachecontrol = { version = "^0.12.9", extras = ["filecache"] }
cachy = "^0.3.0"
cleo = "^1.0.0a5"
crashtest = "^0.3.0"
cleo = "^2.0.0"
crashtest = "^0.4.1"
dulwich = "^0.20.46"
filelock = "^3.8.0"
html5lib = "^1.0"
importlib-metadata = { version = "^4.4", python = "<3.10" }
jsonschema = "^4.10.0"
# keyring uses calver, so version is unclamped
keyring = ">=21.2.0"
keyring = "^23.9.0"
# packaging uses calver, so version is unclamped
packaging = ">=20.4"
pexpect = "^4.7.0"
pkginfo = "^1.5"
platformdirs = "^2.5.2"
requests = "^2.18"
requests-toolbelt = "^0.9.1"
requests-toolbelt = ">=0.9.1,<0.11.0"
shellingham = "^1.5"
tomli = { version = "^2.0.1", python = "<3.11" }
# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3"
# trove-classifiers uses calver, so version is unclamped
trove-classifiers = ">=2022.5.19"
# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953
virtualenv = ">=20.4.3,!=20.4.5,!=20.4.6"
xattr = { version = "^0.9.7", markers = "sys_platform == 'darwin'" }
virtualenv = [
{ version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" },
# see https://github.com/python-poetry/poetry/pull/6950 for details
{ version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" },
]
xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" }
urllib3 = "^1.26.0"
dulwich = "^0.20.46"
[tool.poetry.group.dev.dependencies]
tox = "^3.18"
pre-commit = "^2.6"
[tool.poetry.group.test.dependencies]
# Cachy frozen to test backwards compatibility for `poetry.utils.cache`.
cachy = "0.3.0"
deepdiff = "^5.0"
flatdict = "^4.0.1"
httpretty = "^1.0"
@@ -88,7 +98,7 @@ pytest-xdist = { version = "^2.5", extras = ["psutil"] }
zipp = { version = "^3.4", python = "<3.8" }
[tool.poetry.group.typing.dependencies]
mypy = ">=0.971"
mypy = ">=0.990"
types-html5lib = ">=1.1.9"
types-jsonschema = ">=4.9.0"
types-requests = ">=2.28.8"
@@ -163,9 +173,7 @@ warn_unused_ignores = false
[[tool.mypy.overrides]]
module = [
'cachecontrol.*',
'cachy.*',
'cleo.*',
'crashtest.*',
'lockfile.*',
'pexpect.*',
'pkginfo.*',
'requests_toolbelt.*',

4
pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
View File

@@ -1,8 +1,8 @@
{
"owner": "python-poetry",
"repo": "poetry",
"rev": "1.2.2",
"sha256": "04cdrq9mjdnp28jx63vjlwj72wrad7941hp3k7263qskzlp27ql6",
"rev": "1.3.0",
"sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv",
"fetchSubmodules": true
}

28
pkgs/development/tools/roswell/default.nix
View File

@@ -1,14 +1,22 @@
{ lib, stdenv, fetchFromGitHub, curl, autoconf, automake, makeWrapper, sbcl }:
{ lib
, stdenv
, fetchFromGitHub
, curl
, autoconf
, automake
, makeWrapper
, sbcl
}:
stdenv.mkDerivation rec {
pname = "roswell";
version = "21.10.14.111";
version = "22.12.14.112";
src = fetchFromGitHub {
owner = "roswell";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K4RDNTY8g6MNjjiwXMmYaZm0fChJ1C1eTpc0h7ja1ds=";
hash = "sha256-Aqgv2WPmQDuBR4/OgjPeC+kzHL3DrImL24z7fbsfGRo=";
};
patches = [
@@ -31,16 +39,24 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros
'';
nativeBuildInputs = [ autoconf automake makeWrapper ];
nativeBuildInputs = [
autoconf
automake
makeWrapper
];
buildInputs = [ sbcl curl ];
buildInputs = [
sbcl
curl
];
meta = with lib; {
description = "Roswell is a Lisp implementation installer/manager, launcher, and much more";
description = "Lisp implementation installer/manager and launcher";
license = licenses.mit;
maintainers = with maintainers; [ hiro98 ];
platforms = platforms.unix;
homepage = "https://github.com/roswell/roswell";
changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog";
mainProgram = "ros";
};
}

6
pkgs/development/tools/rust/cargo-nextest/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
version = "0.9.45";
version = "0.9.47";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
sha256 = "sha256-Sb5xJCxUz60TfDMqv7Q7hTRVXvligpWkTG4FRAO/H3c=";
sha256 = "sha256-G7Y2x9aRcQB28uR2TlyG8JW9kYSD9iMPASd0VFXOxcE=";
};
cargoSha256 = "sha256-LzhrPQXr+CfzNoMWrPekDvtoPn0iqLhBV+3NO5AV0Po=";
cargoSha256 = "sha256-7fesLvkHPpPS4xKn3r6hLjQzP0udm92BsVPhdckTk7c=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

8
pkgs/development/tools/rust/rust-script/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-script";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "fornwall";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5T5DivfT7/MkBJo5YgLAVnfct84nBhw/OXWQ/4TMm2A=";
rev = version;
sha256 = "sha256-R9L53ThJKf68M4idNiWfO6fUDJNqiyrzCmdbEvo8OMM=";
};
cargoSha256 = "sha256-mDH3R9gn64DXVoe3Vkl2Kwhr7OTOUWKBLW5Y+Uo4aXM=";
cargoSha256 = "sha256-hi0jtI6KtvBjyhhOEEE1x2l7DSIAC4tkRIF9SLFwFQI=";
# tests require network access
doCheck = false;

30
pkgs/development/tools/selene/default.nix
View File

@@ -1,30 +1,46 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, robloxSupport ? true
, pkg-config
, openssl
, stdenv
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "selene";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
owner = "kampfkarren";
repo = pname;
rev = version;
sha256 = "sha256-z1jefnWtaV97kq7CpfKsnFOgLHXDBonsmZTfUKJ4VIM=";
sha256 = "sha256-gD49OzhpO059wawA+PJc8SIYQ23965LF21zqIfj62Y4=";
};
cargoSha256 = "sha256-TjkileWGB7ocBJPGh2Bm1ucigwL4j/uXgIOAonPHjbA=";
cargoSha256 = "sha256-oekqM/Jvh0z6O6iJhSi7Ph5gsF5Fssr5ItKpmyozhPk=";
nativeBuildInputs = lib.optional robloxSupport pkg-config;
patches = [
# fix broken test
# https://github.com/kampfkarren/selene/pull/471
(fetchpatch {
name = "fix-test-roblox-incorrect-roact-usage.patch";
url = "https://github.com/kampfkarren/selene/commit/f4abf9f3fb639b372fe4ac47449f8a1e455c28a5.patch";
sha256 = "sha256-nk7HGygXXu91cqiRZBA/sLBlaJLkNg90C2NX8Kr1WGA=";
})
];
buildInputs = lib.optional robloxSupport openssl
++ lib.optional (robloxSupport && stdenv.isDarwin) Security;
nativeBuildInputs = lib.optionals robloxSupport [
pkg-config
];
buildInputs = lib.optionals robloxSupport [
openssl
] ++ lib.optional (robloxSupport && stdenv.isDarwin) [
darwin.apple_sdk.frameworks.Security
];
buildNoDefaultFeatures = !robloxSupport;

6
pkgs/games/factorio/default.nix
View File

@@ -3,6 +3,8 @@
, libSM, libICE, libXext, factorio-utils
, releaseType
, mods ? []
, mods-dat ? null
, versionsJson ? ./versions.json
, username ? "", token ? "" # get/reset token at https://factorio.com/profile
, experimental ? false # true means to always use the latest branch
}:
@@ -60,7 +62,7 @@ let
# NB `experimental` directs us to take the latest build, regardless of its branch;
# hence the (stable, experimental) pairs may sometimes refer to the same distributable.
versions = importJSON ./versions.json;
versions = importJSON versionsJson;
binDists = makeBinDists versions;
actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download.");
@@ -129,7 +131,7 @@ let
fi
'';
modDir = factorio-utils.mkModDirDrv mods;
modDir = factorio-utils.mkModDirDrv mods mods-dat;
base = with actual; {
pname = "factorio-${releaseType}";

6
pkgs/games/factorio/utils.nix
View File

@@ -3,7 +3,7 @@
{ lib, stdenv }:
with lib;
{
mkModDirDrv = mods: # a list of mod derivations
mkModDirDrv = mods: modsDatFile: # a list of mod derivations
let
recursiveDeps = modDrv: [modDrv] ++ map recursiveDeps modDrv.deps;
modDrvs = unique (flatten (map recursiveDeps mods));
@@ -18,7 +18,9 @@ with lib;
# NB: there will only ever be a single zip file in each mod derivation's output dir
ln -s $modDrv/*.zip $out
done
'';
'' + (lib.optionalString (modsDatFile != null) ''
cp ${modsDatFile} $out/mod-settings.dat
'');
};
modDrv = { allRecommendedMods, allOptionalMods }:

4
pkgs/os-specific/solo5/default.nix
View File

@@ -2,7 +2,7 @@
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.7.4";
version = "0.7.5";
# list of all theoretically available targets
targets = [
"genode"
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
sha256 = "sha256-ovDdaS2cDufe5gTgi+t2C8waWiRC40/2flLLJlz+NvU=";
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
};
hardeningEnable = [ "pie" ];

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

@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.10.7";
version = "0.10.8";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
sha256 = "sha256-7A2HUGjWjqbLgoXKTQ1oEsoUMwFUvsaRVFvc7QwWTuE=";
sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8=";
};
vendorSha256 = "sha256-G2i5ZHyu71mSo4VCmJpHFjzlZrRmxHObEAc7/09/rA8=";
vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU=";
subPackages = [
# The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith

6
pkgs/servers/home-assistant/component-packages.nix
View File

@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.12.0";
version = "2022.12.1";
components = {
"3_day_blinds" = ps: with ps; [
];
@@ -2889,8 +2889,9 @@
pillow
pyserial
pyudev
ruuvitag-ble
sqlalchemy
]; # missing inputs: ruuvitag-ble
];
"sabnzbd" = ps: with ps; [
pysabnzbd
];
@@ -4568,6 +4569,7 @@
"rss_feed_template"
"rtsp_to_webrtc"
"ruckus_unleashed"
"ruuvitag_ble"
"sabnzbd"
"safe_mode"
"samsungtv"

4
pkgs/servers/home-assistant/default.nix
View File

@@ -188,7 +188,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.12.0";
hassVersion = "2022.12.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -206,7 +206,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-EucTvr/XISdRIpbNkLZjSAHubIbEE3VvMf2y5XE7/n8=";
hash = "sha256-WpgSWNV9/k1LDkzNftvS9Td73QaFoXhnj7Dk7pT+Zlg=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/home-assistant/frontend.nix
View File

@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20221207.0";
version = "20221208.0";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-8sLk9cWbsEkPf3sL0UWhrlxLOUABXKqDrKZfE0HVDjw=";
hash = "sha256-llMKmEkPSrb9j7chAVXGvqpLfpmlFlwqiusOH1p+rAQ=";
};
# there is nothing to strip in this package

6
pkgs/servers/http/pomerium/default.nix
View File

@@ -14,15 +14,15 @@ let
in
buildGoModule rec {
pname = "pomerium";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
sha256 = "sha256-+YcYrhUQMiLUcBnYhTHxf+NrmQIdYpeO/blMgU33w6o=";
sha256 = "sha256-J8ediRreV80lzPcKIOSl1CNHp04ZW9ePyNyejlN50cE=";
};
vendorSha256 = "sha256-Y8RFMW9nfO6cMCw1SDowKkpPHfUwGhzLPXr7vM6y6Nw=";
vendorSha256 = "sha256-V8asyi1Nm+h3KK/loBRZQN6atfEGUEdRydeZsp9wyQY=";
ui = mkYarnPackage {
inherit version;

16
pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
View File

@@ -1,23 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib
, buildGoModule
, fetchFromGitHub
, nixosTests
}:
buildGoModule rec {
pname = "artifactory_exporter";
version = "1.9.5";
version = "1.10.0";
rev = "v${version}";
src = fetchFromGitHub {
owner = "peimanja";
repo = pname;
rev = rev;
sha256 = "sha256-QUluuxuOgeq5CnpmVh5uDC4SEWD97JbQCHiYjYUs/nI=";
hash = "sha256-Yzdh9xpgPLbN9J5oBvrrPuVMTq2F3mpE544sAo7gmng=";
};
vendorSha256 = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg=";
vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg=";
subPackages = [ "." ];
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=${rev}"
"-X github.com/prometheus/common/version.Branch=master"
@@ -29,6 +34,7 @@ buildGoModule rec {
meta = with lib; {
description = "JFrog Artifactory Prometheus Exporter";
homepage = "https://github.com/peimanja/artifactory_exporter";
changelog = "https://github.com/peimanja/artifactory_exporter/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ lbpdt ];
};

4
pkgs/servers/monitoring/prometheus/fastly-exporter.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fastly-exporter";
version = "7.3.0";
version = "7.4.0";
src = fetchFromGitHub {
owner = "peterbourgon";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oeRf/qjoe8ThzuyIGPOWO+5KTY318Fz3TGp5svXBGQU=";
sha256 = "sha256-jZXQ5N6xIBk85ae4dPERB0tY5TBeIT6ThG6rLYLHmJ0=";
};
vendorSha256 = "sha256-BBfI5SyTgaoXXHxhraH09YVi43v1mD6Ia8oyh+TYqvA=";

6
pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "haproxy_exporter";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "haproxy_exporter";
rev = "v${version}";
sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";
sha256 = "sha256-u5o8XpKkuaNzAZAdA33GLd0QJSpqnkEbI8gW22G7FcY=";
};
vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";
vendorSha256 = "sha256-lDoW1rkOn2YkEf3QZdWBpm5fdzjkbER35XnXFr57D8c=";
ldflags = [ "-s" "-w" ];

6
pkgs/servers/piping-server-rust/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "piping-server-rust";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "nwtgck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QgOrKAPLphvIMqcOrbYuo4ra65IV8dK5+6tyh+YyyP4=";
sha256 = "sha256-s7tfGt1P/GmvjkIcy8DEwz+ObPxoMsIL7meAc5vMkKo=";
};
cargoSha256 = "sha256-Nd+Frhospp6ERYFuxzEzKbkLAFqTv7Lp7MWwv09S+KA=";
cargoSha256 = "sha256-gqKEFqf49sKZy+L0X4MxUfx2+iYoNIU415xHqOy8MZA=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];

4
pkgs/servers/redpanda/default.nix
View File

@@ -1,13 +1,13 @@
{ lib, stdenv, fetchzip }:
let
version = "22.3.1";
version = "22.3.5";
platform = if stdenv.isLinux then "linux" else "darwin";
arch = if stdenv.isAarch64 then "arm" else "amd";
sha256s = {
darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g=";
darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4=";
linux.amd = "sha256-liUFM9f7OQocb5j/qvZNVWiJGIf651ULMlRmX67qyoQ=";
linux.amd = "sha256-wsUuSCstYucjMpFsqssPGEhm3zCrAdE9Mldtkypbthg=";
linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8=";
};
in stdenv.mkDerivation rec {

24
pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
View File

@@ -2,33 +2,15 @@
stdenv.mkDerivation rec {
pname = "tt-rss-plugin-auth-ldap";
version = "unstable-2022-10-31";
version = "unstable-2022-11-30";
src = fetchFromGitHub {
owner = "hydrian";
repo = "TTRSS-Auth-LDAP";
rev = "0cc2a21441f99eef8368cfe0fbdbb78126e28d61";
sha256 = "sha256-pJWyvRnC38Ov1awVLgFZfp8+haADPniP+/P/C74qpcA=";
rev = "582ade49fd433a30b403caa1d0689fca5f3c99e1";
sha256 = "sha256-favz/2KvWqvv8ehTv3gc7TBbFDjkrOmutChnyKPgces=";
};
patches = [
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/47
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/003ca55bbd6e0a87fb729383e51eb269d918313d.patch";
sha256 = "sha256-0YD33JPNOOPH2dpGwA/RbV3Kg4i2oKazBjP3hBcUIes=";
})
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch";
sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A=";
})
# https://github.com/hydrian/TTRSS-Auth-LDAP/pull/34
(fetchpatch {
url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/b1a873f6a7d18231d2ac804d0146d6e048c8382c.patch";
sha256 = "sha256-t5bDQM97dGwr7tHSS9cSO7qApf2M8KNaIuIxbAjExrs=";
})
];
installPhase = ''
install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php
'';

15
pkgs/servers/web-apps/snipe-it/default.nix
View File

@@ -1,4 +1,10 @@
{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/snipe-it", mariadb }:
{ lib
, pkgs
, stdenv
, fetchFromGitHub
, dataDir ? "/var/lib/snipe-it"
, mariadb
}:
let
package = (import ./composition.nix {
@@ -27,17 +33,17 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.13";
version = "6.0.14";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QwPl3JXB8gZS1/VyPBCc3PIQa+qtUNpuANSx4+oxWYg=";
hash = "sha256-c2hzuNOpvVl+ZriCo3TRl/GHY+LCrIb2GO2U894S2yk=";
};
meta = with lib; {
description = "A free open source IT asset/license management system ";
description = "A free open source IT asset/license management system";
longDescription = ''
Snipe-IT was made for IT asset management, to enable IT departments to track
who has which laptop, when it was purchased, which software licenses and accessories
@@ -45,6 +51,7 @@ in package.override rec {
Details for snipe-it can be found on the official website at https://snipeitapp.com/.
'';
homepage = "https://snipeitapp.com/";
changelog = "https://github.com/snipe/snipe-it/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ yayayayaka ];
platforms = platforms.linux;

15
pkgs/shells/nushell/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, runCommand
, rustPlatform
, openssl
@@ -33,6 +34,16 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-OVJr+usN+47yBHFAy94rIVlU2F+Klo6xdrV2MwUoKUE=";
};
patches = [
# https://github.com/nushell/nushell/pull/7423: make tests
# more resilient (less dependent on env).
# Already merged upstream, so can be dropped in the next version
(fetchpatch {
url = "https://github.com/nushell/nushell/commit/87631e7068bfc6635d5b31413856f0a791994527.patch";
hash = "sha256-9vrcmBe5gXLLodynb3jyarwi/a0YiurJ6WsDxXl2vjo=";
})
];
cargoSha256 = "sha256-v6mPr+gOT64rKYuog+hS7/AqUZDailoOBXX3Sfeo+sk=";
# enable pkg-config feature of zstd
@@ -66,9 +77,7 @@ rustPlatform.buildRustPackage rec {
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
# doCheck = ! stdenv.isDarwin;
# TODO tests are not guaranteed while package is in beta
doCheck = false;
doCheck = ! stdenv.isDarwin;
checkPhase = ''
runHook preCheck

6
pkgs/tools/admin/kics/default.nix
View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
sha256 = "sha256-Y/fG10WKdSXNU9pLSItPKmTNfx8hL/YO8wtwTHob1QQ=";
sha256 = "sha256-/ceo4/dq9K3yZBl0P5C018C4IyhINUuZLTtA5t5K+v0=";
};
vendorSha256 = "sha256-sIIEWIVb1d4GDZVLfXz1myeQcxaG6aF8gYJn9+C8zQk=";
vendorSha256 = "sha256-1C2Sf9yvjklXOFy181VaeQ205VnlhLd8ucD9TsLIyg0=";
subPackages = [ "cmd/console" ];

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