swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-06-02 00:16:40 +00:00 committed by GitHub
parent 09c8e8a3f1 e6123938ca
commit a52fa8397a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 3131 additions and 2324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/builders/packages/firefox.section.md
View file

@ -26,10 +26,14 @@ The `wrapFirefox` function allows to pass policies, preferences and extensions t
Pocket = false;
Snippets = false;
};
UserMessaging = {
ExtensionRecommendations = false;
SkipOnboarding = true;
};
UserMessaging = {
ExtensionRecommendations = false;
SkipOnboarding = true;
};
SecurityDevices = {
# Use a proxy module rather than `nixpkgs.config.firefox.smartcardSupport = true`
"PKCS#11 Proxy Module" = "${pkgs.p11-kit}/lib/p11-kit-proxy.so";
};
};
extraPrefs = ''

66
doc/languages-frameworks/python.section.md
View file

@ -663,6 +663,70 @@ However, this is done in it's own phase, and not dependent on whether `doCheck =
This can also be useful in verifying that the package doesn't assume commonly
present packages (e.g. `setuptools`)
#### Using pythonRelaxDepsHook {#using-pythonrelaxdepshook}
It is common for upstream to specify a range of versions for its package
dependencies. This makes sense, since it ensures that the package will be built
with a subset of packages that is well tested. However, this commonly causes
issues when packaging in Nixpkgs, because the dependencies that this package
may need are too new or old for the package to build correctly. We also cannot
package multiple versions of the same package since this may cause conflicts
in `PYTHONPATH`.
One way to side step this issue is to relax the dependencies. This can be done
by either removing the package version range or by removing the package
declaration entirely. This can be done using the `pythonRelaxDepsHook` hook. For
example, given the following `requirements.txt` file:
```
pkg1<1.0
pkg2
pkg3>=1.0,<=2.0
```
we can do:
```
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "pkg1" "pkg3" ];
pythonRemoveDeps = [ "pkg2" ];
```
which would result in the following `requirements.txt` file:
```
pkg1
pkg3
```
Another option is to pass `true`, that will relax/remove all dependencies, for
example:
```
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = true;
```
which would result in the following `requirements.txt` file:
```
pkg1
pkg2
pkg3
```
In general you should always use `pythonRelaxDeps`, because `pythonRemoveDeps`
will convert build errors in runtime errors. However `pythonRemoveDeps` may
still be useful in exceptional cases, and also to remove dependencies wrongly
declared by upstream (for example, declaring `black` as a runtime dependency
instead of a dev dependency).
Keep in mind that while the examples above are done with `requirements.txt`,
`pythonRelaxDepsHook` works by modifying the resulting wheel file, so it should
work in any of the formats supported by `buildPythonPackage` currently,
with the exception of `other` (see `format` in
[`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details).
### Develop local package {#develop-local-package}
As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode)
@ -1197,6 +1261,8 @@ are used in `buildPythonPackage`.
to run commands only after venv is first created.
- `wheelUnpackHook` to move a wheel to the correct folder so it can be installed
with the `pipInstallHook`.
- `pythonRelaxDepsHook` will relax Python dependencies restrictions for the package.
See [example usage](#using-pythonrelaxdepshook).
### Development mode {#development-mode}

2
nixos/modules/hardware/new-lg4ff.nix
View file

@ -17,7 +17,7 @@ in {
};
};
config = {
config = lib.mkIf cfg.enable {
boot = {
extraModulePackages = [ pkgs.new-lg4ff ];
kernelModules = [ "hid-logitech-new" ];

32
nixos/modules/services/system/localtime.nix
View file

@ -3,30 +3,26 @@
with lib;
let
cfg = config.services.localtime;
cfg = config.services.localtimed;
in {
options = {
services.localtime = {
services.localtimed = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable <literal>localtime</literal>, simple daemon for keeping the system
timezone up-to-date based on the current location. It uses geoclue2 to
determine the current location and systemd-timedated to actually set
the timezone.
Enable <literal>localtimed</literal>, a simple daemon for keeping the
system timezone up-to-date based on the current location. It uses
geoclue2 to determine the current location.
'';
};
};
};
config = mkIf cfg.enable {
services.geoclue2 = {
enable = true;
appConfig.localtime = {
isAllowed = true;
isSystem = true;
};
services.geoclue2.appConfig.localtimed = {
isAllowed = true;
isSystem = true;
};
# Install the polkit rules.
@ -34,16 +30,6 @@ in {
# Install the systemd unit.
systemd.packages = [ pkgs.localtime ];
users.users.localtimed = {
description = "localtime daemon";
isSystemUser = true;
group = "localtimed";
};
users.groups.localtimed = {};
systemd.services.localtime = {
wantedBy = [ "multi-user.target" ];
serviceConfig.Restart = "on-failure";
};
systemd.services.localtime.wantedBy = [ "multi-user.target" ];
};
}

12
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -904,6 +904,18 @@ final: prev:
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
bullets-vim = buildVimPluginFrom2Nix {
pname = "bullets.vim";
version = "2022-06-01";
src = fetchFromGitHub {
owner = "dkarter";
repo = "bullets.vim";
rev = "f3b4ae71f60b5723077a77cfe9e8776a3ca553ac";
sha256 = "1dfgxdmvzjqjc1viqx2nmzzrjr2n7c6931d3iypv96p2zywld99s";
};
meta.homepage = "https://github.com/dkarter/bullets.vim/";
};
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar.vim";
version = "2022-03-21";

1
pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
View file

@ -8,6 +8,7 @@
"license": "MIT",
"private": true,
"dependencies": {
"@chemzqm/neovim": "5.7.9",
"log4js": "3.0.6",
"neovim": "4.2.1",
"socket.io": "2.1.1",

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

@ -74,6 +74,7 @@ https://github.com/fruit-in/brainfuck-vim/,,
https://github.com/famiu/bufdelete.nvim/,,
https://github.com/jlanzarotta/bufexplorer/,,
https://github.com/akinsho/bufferline.nvim/,,
https://github.com/dkarter/bullets.vim/,,
https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
https://github.com/itchyny/calendar.vim/,,
https://github.com/bkad/camelcasemotion/,,

178
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -277,6 +277,23 @@ let
};
};
attilabuti.brainfuck-syntax = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "brainfuck-syntax";
publisher = "attilabuti";
version = "0.0.1";
sha256 = "sha256-ZcZlHoa2aoCeruMWbUUgfFHsPqyWmd2xFY6AKxJysYE=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/attilabuti.brainfuck-syntax/changelog";
description = "VSCode extension providing syntax highlighting support for Brainfuck";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax";
homepage = "https://github.com/attilabuti/brainfuck-syntax";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
ms-python.vscode-pylance = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pylance";
@ -321,6 +338,22 @@ let
};
};
badochov.ocaml-formatter = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "ocaml-formatter";
publisher = "badochov";
version = "1.14.0";
sha256 = "sha256-Iekh3vwu8iz53rPRsuu1Fx9iA/A97iMd8cPETWavnyA=";
};
meta = with lib; {
description = "VSCode Extension Formatter for OCaml language";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter";
homepage = "https://github.com/badochov/ocamlformatter-vscode";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
bbenoist.nix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Nix";
@ -457,8 +490,8 @@ let
mktplcRef = {
name = "path-intellisense";
publisher = "christian-kohler";
version = "2.6.1";
sha256 = "sha256-ol98g3pliBlyEQ+n7cR4O04J/0QB9U8+fvf+FC0j0Fc=";
version = "2.8.0";
sha256 = "sha256-VPzy9o0DeYRkNwTGphC51vzBTNgQwqKg+t7MpGPLahM=";
};
meta = with lib; {
description = "Visual Studio Code plugin that autocompletes filenames";
@ -683,8 +716,8 @@ let
mktplcRef = {
name = "githistory";
publisher = "donjayamanne";
version = "0.6.14";
sha256 = "11x116hzqnhgbryp2kqpki1z5mlnwxb0ly9r1513m5vgbisrsn0i";
version = "0.6.19";
sha256 = "15s2mva9hg2pw499g890v3jycncdps2dmmrmrkj3rns8fkhjn8b3";
};
};
@ -886,8 +919,8 @@ let
mktplcRef = {
name = "file-icons";
publisher = "file-icons";
version = "1.0.28";
sha256 = "1lyx0l42xhi2f3rdnjddc3mw7m913kjnchawi98i6vqsx3dv7091";
version = "1.0.29";
sha256 = "05x45f9yaivsz8a1ahlv5m8gy2kkz71850dhdvwmgii0vljc8jc6";
};
};
@ -976,6 +1009,38 @@ let
};
};
gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "html-slim-scss-css-class-completion";
publisher = "gencer";
version = "1.7.8";
sha256 = "18qws35qvnl0ahk5sxh4mzkw0ib788y1l97ijmpjszs0cd4bfsa6";
};
meta = with lib; {
description = "VSCode extension for SCSS";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion";
homepage = "https://github.com/gencer/SCSS-Everywhere";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
gitlab.gitlab-workflow = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "3.44.2";
sha256 = "sha256-S2PI+r4LrHA7tW2EMfcAkP5jUnd0mCEV72oTXMa9Xkc=";
};
meta = with lib; {
description = "GitLab extension for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow";
homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
humao.rest-client = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "humao";
@ -1056,8 +1121,8 @@ let
mktplcRef = {
name = "Go";
publisher = "golang";
version = "0.25.1";
sha256 = "sha256-ZDUWN9lzDnR77W7xcMFQaaFl/6Lf/x1jgaBkwZPqGGw=";
version = "0.33.1";
sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g";
};
meta = {
license = lib.licenses.mit;
@ -1184,6 +1249,22 @@ let
};
};
irongeek.vscode-env = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-env";
publisher = "irongeek";
version = "0.1.0";
sha256 = "sha256-URq90lOFtPCNfSIl2NUwihwRQyqgDysGmBc3NG7o7vk=";
};
meta = with lib; {
description = "Adds formatting and syntax highlighting support for env files (.env) to Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env";
homepage = "https://github.com/IronGeek/vscode-env.git";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
jakebecker.elixir-ls = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "elixir-ls";
@ -1237,8 +1318,8 @@ let
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
version = "0.1.19";
sha256 = "1ms96ij6z4bysdhqgdaxx2znvczyhzx57iifbqws50m1c3m7pkx7";
version = "0.1.20";
sha256 = "16mmivdssjky11gmih7zp99d41m09r0ii43n17d4i6xwivagi9a3";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
@ -1650,6 +1731,22 @@ let
};
};
phoenixframework.phoenix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "phoenix";
publisher = "phoenixframework";
version = "0.1.1";
sha256 = "sha256-AfCwU4FF8a8C9D6+lyUDbAOLlD5SpZZw8CZVGpzRoV0=";
};
meta = with lib; {
description = "Syntax highlighting support for HEEx / Phoenix templates";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix";
homepage = "https://github.com/phoenixframework/vscode-phoenix";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
redhat.java = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "java";
@ -1668,8 +1765,8 @@ let
mktplcRef = {
name = "vscode-yaml";
publisher = "redhat";
version = "1.5.1";
sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM=";
version = "1.7.0";
sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc";
};
meta = {
license = lib.licenses.mit;
@ -1744,6 +1841,23 @@ let
};
};
prisma.prisma = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "3.14.0";
sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
description = "VSCode extension for syntax highlighting, formatting, auto-completion, jump-to-definition and linting for .prisma files";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma";
homepage = "https://github.com/prisma/language-tools";
license = licenses.asl20;
maintainers = with maintainers; [ superherointj ];
};
};
richie5um2.snake-trail = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "snake-trail";
@ -1930,6 +2044,22 @@ let
};
};
stefanjarina.vscode-eex-snippets = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-eex-snippets";
publisher = "stefanjarina";
version = "0.0.8";
sha256 = "0j8pmrs1lk138vhqx594pzxvrma4yl3jh7ihqm2kgh0cwnkbj36m";
};
meta = with lib; {
description = "VSCode extension for Elixir EEx and HTML (EEx) code snippets";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets";
homepage = "https://github.com/stefanjarina/vscode-eex-snippets";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
stephlin.vscode-tmux-keybinding = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-tmux-keybinding";
@ -2046,6 +2176,22 @@ let
};
};
theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "language-pascal";
publisher = "theangryepicbanana";
version = "0.1.6";
sha256 = "096wwmwpas21f03pbbz40rvc792xzpl5qqddzbry41glxpzywy6b";
};
meta = with lib; {
description = "VSCode extension for high-quality Pascal highlighting";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal";
homepage = "https://github.com/ALANVF/vscode-pascal-magic";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
};
tiehuis.zig = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "zig";
@ -2063,8 +2209,8 @@ let
mktplcRef = {
name = "shellcheck";
publisher = "timonwong";
version = "0.18.4";
sha256 = "00cii58md6v028h0xfvbdjvg3r44451mi0lfmjwiwif5xcw3wnlx";
version = "0.19.3";
sha256 = "0l8fbim19jgcdgxxgidnhdczxvhls920vrffwrac8k1y34lgfl3v";
};
nativeBuildInputs = [ jq moreutils ];
postInstall = ''
@ -2131,8 +2277,8 @@ let
mktplcRef = {
name = "errorlens";
publisher = "usernamehw";
version = "3.4.1";
sha256 = "1mr8si7jglpjw8qzl4af1k7r68vz03fpal1dr8i0iy4ly26pz7bh";
version = "3.5.1";
sha256 = "17xbbr5hjrs67yazicb9qillbkp3wnaccjpnl1jlp07s0n7q4f8f";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";

4
pkgs/applications/editors/vscode/extensions/rescript/default.nix
View file

@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "rescript-vscode";
publisher = "chenglou92";
version = "1.1.3";
sha256 = "1c1ipxgm0f0a3vlnhr0v85jr5l3rwpjzh9w8nv2jn5vgvpas0b2a";
version = "1.3.0";
sha256 = "sha256-Sgi7FFOpI/XOeyPOrDhwZdZ+43ilUz7oQ49yB7tiMXk=";
};
postPatch = ''
rm -r ${analysisDir}

6
pkgs/applications/graphics/ascii-image-converter/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ascii-image-converter";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "TheZoraiz";
repo = "ascii-image-converter";
rev = "v${version}";
sha256 = "DitJnWIz1Dt9yXtyQp/z738IAmG4neYmfc49Wdjos7Q=";
sha256 = "5Sa9PqhoJ/LCAHrymqVCO4bI39mQeVa4xv1z235Cxvg=";
};
vendorSha256 = "sha256-pKgukWKF4f/kLASjh8aKU7x9UBW/H+4C/02vxmh+qOU=";
vendorSha256 = "rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs=";
meta = with lib; {
description = "Convert images into ASCII art on the console";

2
pkgs/applications/misc/moz-phab/default.nix
View file

@ -5,6 +5,7 @@
# build inputs
, distro
, glean-sdk
, pip
, python-hglib
, sentry-sdk
, setuptools
@ -30,6 +31,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
distro
glean-sdk
pip
python-hglib
sentry-sdk
setuptools

41
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -118,28 +118,27 @@ let
lib.optionalAttrs usesNixExtensions {
ExtensionSettings = {
"*" = {
blocked_install_message = "You can't have manual extension mixed with nix extensions";
installation_mode = "blocked";
};
blocked_install_message = "You can't have manual extension mixed with nix extensions";
installation_mode = "blocked";
};
} // lib.foldr (e: ret:
ret // {
"${e.extid}" = {
installation_mode = "allowed";
};
}
) {} extensions;
} // lib.optionalAttrs usesNixExtensions {
Extensions = {
Install = lib.foldr (e: ret:
ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
) [] extensions;
};
} // lib.optionalAttrs smartcardSupport {
SecurityDevices = {
"OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so";
};
}
ret // {
"${e.extid}" = {
installation_mode = "allowed";
};
}
) {} extensions;
Extensions = {
Install = lib.foldr (e: ret:
ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
) [] extensions;
};
} // lib.optionalAttrs smartcardSupport {
SecurityDevices = {
"OpenSC PKCS#11 Module" = "opensc-pkcs11.so";
};
}
// extraPolicies;
};

39
pkgs/applications/networking/cluster/gatekeeper/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "gatekeeper";
version = "3.8.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
sha256 = "sha256-zEUH88sjgR738BXK2oSSM6jf5oHZt0VJv61BcxclG1Q=";
};
vendorSha256 = null;
nativeBuildInputs = [
installShellFiles
];
subPackages = [ "cmd/gator" ];
postInstall = ''
installShellCompletion --cmd gator \
--bash <($out/bin/gator completion bash) \
--fish <($out/bin/gator completion fish) \
--zsh <($out/bin/gator completion zsh)
'';
meta = with lib; {
description = "Policy Controller for Kubernetes";
homepage = "https://github.com/open-policy-agent/gatekeeper";
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

6
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -192,9 +192,9 @@ rec {
};
terraform_1 = mkTerraform {
version = "1.2.1";
sha256 = "sha256-zvpKL7SsUeDu7pHSJTYbbJcn7kDcGk5M2jBMkkBLMtE=";
vendorSha256 = "sha256-2w0XAoja3DwztI3WxvLCUqrjW1PzSR6BU0T8TtM3TAw=";
version = "1.2.2";
sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8=";
vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};

6
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "purple-xmpp-upload";
version = "unstable-2017-12-31";
version = "unstable-2021-11-04";
src = fetchFromGitHub {
owner = "Junker";
repo = "purple-xmpp-http-upload";
rev = "178096cbfc9df165c2dc1677666439969d212b37";
sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp";
rev = "f370b4a2c474c6fe4098d929d8b7c18aeba87b6b";
sha256 = "0n05jybmibn44xb660p08vrrbanfsyjn17w1xm9gwl75fxxq8cdc";
};
buildInputs = [ pidgin glib libxml2 ];

6
pkgs/applications/video/manim/default.nix
View file

@ -61,8 +61,9 @@ in python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cloup = "^0.13.0"' 'cloup = "*"' \
--replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \
--replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \
--replace 'cloup = "^0.13.0"' 'cloup = "*"' \
--replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \
'';
buildInputs = [ cairo ];
@ -106,7 +107,6 @@ in python3.pkgs.buildPythonApplication rec {
checkInputs = [
python3.pkgs.pytest-cov
python3.pkgs.pytest-xdist
python3.pkgs.pytestCheckHook

4
pkgs/development/libraries/intel-media-driver/default.nix
View file

@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "22.3.0";
version = "22.4.2";
outputs = [ "out" "dev" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "sha256-TQmXU/Roij6U6NTt3oywhjpPJzaFeR4hhVor11mgaRE=";
sha256 = "sha256-wJiXtRPv9t34GujUhkhDKmIblMMR8yx8Fe1Xony6QVY=";
};
patches = [

1710
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

53
pkgs/development/python-modules/aplpy/default.nix
View file

@ -1,20 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, numpy
, astropy
, astropy-helpers
, buildPythonPackage
, cython
, fetchpatch
, fetchPypi
, matplotlib
, reproject
, numpy
, pillow
, pyavm
, pyregion
, pillow
, scikitimage
, cython
, shapely
, pytest
, pytest-astropy
, pytestCheckHook
, pythonOlder
, reproject
, scikitimage
, shapely
}:
buildPythonPackage rec {
@ -22,36 +23,48 @@ buildPythonPackage rec {
version = "2.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "aplpy";
inherit version;
sha256 = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4=";
hash = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4=";
};
nativeBuildInputs = [
astropy-helpers
];
propagatedBuildInputs = [
numpy
cython
astropy
cython
matplotlib
reproject
numpy
pillow
pyavm
pyregion
pillow
reproject
scikitimage
shapely
];
nativeBuildInputs = [ astropy-helpers ];
checkInputs = [ pytest pytest-astropy ];
checkInputs = [
pytest-astropy
pytestCheckHook
];
checkPhase = ''
OPENMP_EXPECTED=0 pytest aplpy
preCheck = ''
OPENMP_EXPECTED=0
'';
pythonImportsCheck = [
"aplpy"
];
meta = with lib; {
description = "The Astronomical Plotting Library in Python";
homepage = "http://aplpy.github.io";
license = licenses.mit;
maintainers = [ maintainers.smaret ];
maintainers = with maintainers; [ smaret ];
};
}

4
pkgs/development/python-modules/async-upnp-client/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.29.0";
version = "0.31.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";
sha256 = "sha256-jxipSHSsipnKJF+d7tez9M6bBlwV4r8XGQ2elI0jsVc=";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/bimmer-connected/default.nix
View file

@ -3,17 +3,17 @@
, pythonOlder
, fetchFromGitHub
, pbr
, requests
, httpx
, pycryptodome
, pyjwt
, pytestCheckHook
, requests-mock
, respx
, time-machine
}:
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.8.12";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
hash = "sha256-0yXEm8cjzw1ClSP8a5TB9RrugzgHSu40tTtyNQU4dfY=";
hash = "sha256-ylhvUX5af248KIT54SIe26WP8tysqjZd2y/+Fi+VqHM=";
};
nativeBuildInputs = [
@ -32,14 +32,14 @@ buildPythonPackage rec {
PBR_VERSION = version;
propagatedBuildInputs = [
requests
httpx
pycryptodome
pyjwt
];
checkInputs = [
pytestCheckHook
requests-mock
respx
time-machine
];

46
pkgs/development/python-modules/bond-async/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, aioresponses
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bond-async";
version = "0.1.20";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "bondhome";
repo = "bond-async";
rev = "v${version}";
hash = "sha256-iBtbHS3VzSB6wfWDFq5UVd3++x3HtQbWQ6soPYfcHiM=";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"bond_async"
];
meta = {
description = "Asynchronous Python wrapper library over Bond Local API";
homepage = "https://github.com/bondhome/bond-async";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

18
pkgs/development/python-modules/bracex/default.nix
View file

@ -1,14 +1,26 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchPypi
, hatchling
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bracex";
version = "2.2.1";
version = "2.3.post1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21";
sha256 = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM=";
};
nativeBuildInputs = [
hatchling
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bracex" ];

43
pkgs/development/python-modules/dask-image/default.nix
View file

@ -1,41 +1,54 @@
{ stdenv
, lib
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, dask
, scipy
, fetchPypi
, numpy
, pims
, scikitimage
, pytestCheckHook
, pythonOlder
, scikitimage
, scipy
}:
buildPythonPackage rec {
version = "2021.12.0";
pname = "dask-image";
version = "2021.12.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "35be49626bd01c3e3892128126a27d5ee3266a198a8e3c7e30d59eaef712fcf9";
hash = "sha256-Nb5JYmvQHD44khKBJqJ9XuMmahmKjjx+MNWervcS/Pk=";
};
propagatedBuildInputs = [ dask scipy pims ];
prePatch = ''
substituteInPlace setup.cfg --replace "--flake8" ""
'';
propagatedBuildInputs = [
dask
numpy
scipy
pims
];
checkInputs = [
pytestCheckHook
scikitimage
];
pythonImportsCheck = [ "dask_image" ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "--flake8" ""
'';
pythonImportsCheck = [
"dask_image"
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
homepage = "https://github.com/dask/dask-image";
description = "Distributed image processing";
homepage = "https://github.com/dask/dask-image";
license = licenses.bsdOriginal;
maintainers = [ maintainers.costrouc ];
maintainers = with maintainers; [ costrouc ];
};
}

12
pkgs/development/python-modules/db-dtypes/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, fetchpatch
, fetchFromGitHub
, numpy
, packaging
@ -11,22 +10,15 @@
buildPythonPackage rec {
pname = "db-dtypes";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-db-dtypes-pandas";
rev = "v${version}";
hash = "sha256-7u/E0ICiz7LQfuplm/mkGlWrgGEPqeMwM3CUhfH6868=";
hash = "sha256-T/cyJ0PY5p/y8CKrmeAa9nvnuRs4hd2UKiYiMHLaa7A=";
};
patches = [
(fetchpatch {
url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/fb30adfd427d3df9919df00b096210ba1eb1b91d.patch";
sha256 = "sha256-39kZtYGbn3U1WXiDTczki5EM6SjUlSRXz8UMcdTU20g=";
})
];
propagatedBuildInputs = [
numpy
packaging

4
pkgs/development/python-modules/django/4.nix
View file

@ -39,14 +39,14 @@
buildPythonPackage rec {
pname = "Django";
version = "4.0.4";
version = "4.0.5";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-ToF3hYUkQXVjzAQw8p6iSZRtgx6ssAaKFFVoZYffQLU=";
hash = "sha256-90MaXecneWbzeFVXw5KEMzR9mYweZFkyRQE3iikeWqs=";
};
patches = lib.optional withGdal

4
pkgs/development/python-modules/dsmr-parser/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dsmr-parser";
version = "0.32";
version = "0.33";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ndokter";
repo = "dsmr_parser";
rev = "v${version}";
sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l";
sha256 = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/flask-restful/default.nix
View file

@ -26,7 +26,7 @@ buildPythonPackage rec {
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
};
patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [
patches = [
./werkzeug-2.1.0-compat.patch
];

4
pkgs/development/python-modules/google-api-core/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-api-core";
version = "2.7.1";
version = "2.8.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-sPpXflEvDI4GM4a5dHGLhhRYanmMWJTtNL7fJW2driQ=";
sha256 = "sha256-lYAkxqo0YLCPNXQSMQdqTdmkyBmmo51E2pYn/r6LKPA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-iot/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "2.4.1";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk=";
sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U=";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

4
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.4.1";
version = "1.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0=";
hash = "sha256-U5OoT8Usm2XGB6ya14vzLnI2yO44tvtKSDP0D5xRM4I=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.10.0";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI=";
hash = "sha256-+etRN3Q7Y1oYtQy0Fkoj6ujhx4gD5y+fUriu/eitIQM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-spanner/default.nix
View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.13.0";
version = "3.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Y+MA7Nlx3+8eaBptI6eZgSPGc4MvxSrA9YA+K+VSblw=";
sha256 = "sha256-QOUMedRvbEEDwr1RIsS8tEdvk++OmPBXC4Q5XLzWASs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-tasks/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.8.1";
version = "2.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10=";
sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

4
pkgs/development/python-modules/googleapis-common-protos/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "googleapis-common-protos";
version = "1.56.0";
version = "1.56.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QAdQB5W8/CadJ58PfSU64Y1twf9dWnNhP/5FIDix7F8=";
sha256 = "sha256-sJtW9UYwcMIVN1PvEj8H0uSSNeiRSOmyRZ7I7S9o19M=";
};
propagatedBuildInputs = [ grpc protobuf ];

4
pkgs/development/python-modules/grpc-google-iam-v1/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "grpc-google-iam-v1";
version = "0.12.3";
version = "0.12.4";
src = fetchPypi {
inherit pname version;
sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72";
sha256 = "sha256-PwrCyUC5qFXXzn4x/eKL3bDZrDYtMtB8ZxSDBpMaDjA=";
};
propagatedBuildInputs = [ grpcio googleapis-common-protos ];

51
pkgs/development/python-modules/msgraph-core/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, flit-core
, requests
, pytestCheckHook
, responses
}:
buildPythonPackage rec {
pname = "msgraph-core";
version = "0.2.2";
disabled = pythonOlder "3.5";
format = "pyproject";
src = fetchFromGitHub {
owner = "microsoftgraph";
repo = "msgraph-sdk-python-core";
rev = "v${version}";
hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
responses
];
disabledTestPaths = [
"tests/integration"
];
pythonImportsCheck = [ "msgraph.core" ];
meta = {
description = "Core component of the Microsoft Graph Python SDK";
homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

6
pkgs/development/python-modules/omnikinverter/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, aiohttp
, aresponses
, asynctest
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "omnikinverter";
version = "0.7.0";
version = "0.8.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "klaasnicolaas";
repo = "python-omnikinverter";
rev = "v${version}";
sha256 = "sha256-IiU7nhwH0Mc6s+g9WtJugpORuL0qGNJFKDY5hvxIZAU=";
hash = "sha256-OQWk+ae+hSLLdH0uLVPauoNeQpXgxkvflXFyaiFe108=";
};
nativeBuildInputs = [
@ -35,6 +36,7 @@ buildPythonPackage rec {
checkInputs = [
aresponses
asynctest
pytest-asyncio
pytestCheckHook
];

47
pkgs/development/python-modules/parsedmarc/default.nix
View file

@ -1,26 +1,35 @@
{ buildPythonPackage
, fetchPypi
, fetchurl
, pythonOlder
, lib
, nixosTests
, python
, pythonOlder
# pythonPackages
, tqdm
, dnspython
, expiringdict
, urllib3
, requests
, publicsuffix2
, xmltodict
, geoip2
, urllib3
, requests
, imapclient
, dateparser
, mailsuite
, elasticsearch
, elasticsearch-dsl
, kafka-python
, mailsuite
, tqdm
, lxml
, boto3
, msgraph-core
, azure-identity
, google-api-core
, google-api-python-client
, google-auth
, google-auth-httplib2
, google-auth-oauthlib
}:
let
@ -31,33 +40,49 @@ let
in
buildPythonPackage rec {
pname = "parsedmarc";
version = "7.0.1";
version = "8.2.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1mi4hx410y7ikpfy1582lm252si0c3yryj0idqgqbx417fm21jjc";
sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff";
};
postPatch = ''
substituteInPlace setup.py \
--replace "elasticsearch<7.14.0" "elasticsearch"
'';
propagatedBuildInputs = [
tqdm
dnspython
expiringdict
urllib3
requests
publicsuffix2
xmltodict
geoip2
urllib3
requests
imapclient
dateparser
mailsuite
elasticsearch
elasticsearch-dsl
kafka-python
mailsuite
tqdm
lxml
boto3
msgraph-core
azure-identity
google-api-core
google-api-python-client
google-auth
google-auth-httplib2
google-auth-oauthlib
];
# no tests on PyPI, no tags on GitHub
doCheck = false;
pythonImportsCheck = [ "parsedmarc" ];
passthru = {

4
pkgs/development/python-modules/plexapi/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.10.1";
version = "4.11.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "sha256-0j3uf3wSDFSyDGo3oRi99KNKfhuGP2puSi0KgVjsXnQ=";
sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U=";
};
propagatedBuildInputs = [

33
pkgs/development/python-modules/pydrive/default.nix
View file

@ -1,33 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, google-api-python-client
, oauth2client
, pyyaml
}:
buildPythonPackage rec {
pname = "pydrive";
version = "1.3.1";
src = fetchPypi {
pname = "PyDrive";
inherit version;
sha256 = "11q7l94mb34hfh9wkdwfrh5xw99y13wa33ba7xp1q23q4b60v2c3";
};
propagatedBuildInputs = [
google-api-python-client
oauth2client
pyyaml
];
# requires client_secrets.json
doCheck = false;
meta = {
description = "Google Drive API Python wrapper library";
homepage = "https://github.com/gsuitedevs/PyDrive";
license = lib.licenses.asl20;
};
}

40
pkgs/development/python-modules/pyialarmxr/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, lxml
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "pyialarmxr";
version = "1.0.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bigmoby";
repo = pname;
rev = version;
hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM=";
};
propagatedBuildInputs = [
lxml
xmltodict
];
# Module has no test
doCheck = false;
pythonImportsCheck = [
"pyialarmxr"
];
meta = with lib; {
description = "Library to interface with Antifurto365 iAlarmXR systems";
homepage = "https://github.com/bigmoby/pyialarmxr";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/python-modules/pytest-httpx/default.nix
View file

@ -43,6 +43,6 @@ buildPythonPackage rec {
description = "Send responses to httpx";
homepage = "https://github.com/Colin-b/pytest_httpx";
license = licenses.mit;
maintainers = with maintainers; [ fab SuperSandro2000 ];
maintainers = with maintainers; [ fab ];
};
}

51
pkgs/development/python-modules/python-homewizard-energy/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, protobuf
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-homewizard-energy";
version = "1.0.3";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "DCSBL";
repo = pname;
rev = "v${version}";
hash = "sha256-ioISqRFZZCojTJ/KYS8QUtoEpBNOPqY9lC9NFbZyh5A=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"homewizard_energy"
];
meta = with lib; {
description = "Library to communicate with HomeWizard Energy devices";
homepage = "https://github.com/DCSBL/python-homewizard-energy";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

36
pkgs/development/python-modules/pyws66i/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyws66i";
version = "1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ssaenger";
repo = pname;
rev = "v${version}";
hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY=";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pyws66i"
];
meta = with lib; {
description = "Library to interface with WS66i 6-zone amplifier";
homepage = "https://github.com/bigmoby/pyialarmxr";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

13
pkgs/development/python-modules/tempest/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, buildPythonApplication
, fetchPypi
, fetchpatch
, pbr
, cliff
, jsonschema
@ -29,21 +28,13 @@
buildPythonApplication rec {
pname = "tempest";
version = "29.2.0";
version = "30.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";
sha256 = "sha256-yaNw3c3d8TsSK9cXF9Lw9rKEcqx8YC6cigPURNdJy0A=";
};
patches = [
# remove need for unittest2
(fetchpatch {
url = "https://github.com/openstack/tempest/commit/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch";
sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk=";
})
];
propagatedBuildInputs = [
pbr
cliff

29
pkgs/development/python-modules/types-cryptography/default.nix
View file

@ -1,29 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, types-enum34
, types-ipaddress
}:
buildPythonPackage rec {
pname = "types-cryptography";
version = "3.3.21";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rRucYxWcAJ+GdsfkGk1ZXfuW6MA6/6Lmk+FheQi7QJ4=";
};
pythonImportsCheck = [
"cryptography-stubs"
];
propagatedBuildInputs = [ types-enum34 types-ipaddress ];
meta = with lib; {
description = "Typing stubs for cryptography";
homepage = "https://github.com/python/typeshed";
license = licenses.asl20;
maintainers = with maintainers; [ jpetrucciani ];
};
}

28
pkgs/development/python-modules/types-paramiko/default.nix
View file

@ -1,28 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, types-cryptography
}:
buildPythonPackage rec {
pname = "types-paramiko";
version = "2.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-q2iT1fzl7QaWTWGTntanFoqxSVKUWpCZWmKKXoKl4WE=";
};
pythonImportsCheck = [
"paramiko-stubs"
];
propagatedBuildInputs = [ types-cryptography ];
meta = with lib; {
description = "Typing stubs for paramiko";
homepage = "https://github.com/python/typeshed";
license = licenses.asl20;
maintainers = with maintainers; [ jpetrucciani ];
};
}

43
pkgs/development/python-modules/webtest/default.nix
View file

@ -1,55 +1,54 @@
{ lib
, beautifulsoup4
, buildPythonPackage
, fetchPypi
, isPy27
, webob
, six
, beautifulsoup4
, waitress
, pyquery
, wsgiproxy2
, pastedeploy
, pyquery
, pytestCheckHook
, pythonOlder
, six
, waitress
, webob
, wsgiproxy2
}:
buildPythonPackage rec {
version = "3.0.0";
pname = "webtest";
disabled = isPy27; # paste.deploy is not longer a valid import
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "WebTest";
inherit version;
sha256 = "54bd969725838d9861a9fa27f8d971f79d275d94ae255f5c501f53bb6d9929eb";
hash = "sha256-VL2WlyWDjZhhqfon+Nlx950nXZSuJV9cUB9Tu22ZKes=";
};
postPatch = ''
substituteInPlace setup.py --replace "nose<1.3.0" "nose"
'';
propagatedBuildInputs = [
webob
six
beautifulsoup4
six
waitress
webob
];
checkInputs = [
pytestCheckHook
pastedeploy
wsgiproxy2
pyquery
pytestCheckHook
wsgiproxy2
];
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "webtest" ];
pythonImportsCheck = [
"webtest"
];
meta = with lib; {
description = "Helper to test WSGI applications";
homepage = "https://webtest.readthedocs.org/en/latest/";
homepage = "https://webtest.readthedocs.org/";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/wsgi-intercept/default.nix
View file

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "wsgi-intercept";
version = "1.9.3";
version = "1.10.0";
src = fetchPypi {
pname = "wsgi_intercept";
inherit version;
sha256 = "0c4dc31dc7aabdd263ba45338c201b89e3096a3baaa7d8e3260c68ff18016fb4";
sha256 = "sha256-BX8EWtR8pXkibcliJbfBw6/5VdHs9HczjM1c1SWx3wk=";
};
propagatedBuildInputs = [ six ];

33
pkgs/development/python-modules/wsgiproxy2/default.nix
View file

@ -1,30 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, fetchFromGitHub
, webob
, pythonOlder
}:
buildPythonPackage rec {
pname = "WSGIProxy2";
version = "0.4.2";
pname = "wsgiproxy2";
version = "0.5.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "gawel";
repo = "WSGIProxy2";
rev = version;
hash = "sha256-ouofw3cBQzBwSh3Pdtdl7KI2pg/T/z3qoh8zoeiKiSs=";
};
propagatedBuildInputs = [ six webob ];
propagatedBuildInputs = [
webob
];
# circular dep on webtest
# Circular dependency on webtest
doCheck = false;
pythonImportsCheck = [
"wsgiproxy"
];
meta = with lib; {
homepage = "http://pythonpaste.org/wsgiproxy/";
description = "HTTP proxying tools for WSGI apps";
homepage = "https://wsgiproxy2.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
}

43
pkgs/development/python-modules/yolink-api/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, paho-mqtt
, pydantic
, pythonOlder
}:
buildPythonPackage rec {
pname = "yolink-api";
version = "0.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "YoSmart-Inc";
repo = pname;
rev = "v${version}";
hash = "sha256-LCdPg+T6GMcE8NF32caWgC5lnaN7KOj2gZA/JHPcZKI=";
};
propagatedBuildInputs = [
aiohttp
paho-mqtt
pydantic
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"yolink"
];
meta = with lib; {
description = "Library to interface with Yolink";
homepage = "https://github.com/YoSmart-Inc/yolink-api";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.37.0";
version = "0.37.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-321voxogSkeHMsMdLnrjwG3vQOgGDcMjDen0EUKYE1U=";
hash = "sha256-ciIodpa1ekOqC6wa4r3qxJKW1gzTdoRqeLLaTW/yJQs=";
};
propagatedBuildInputs = [

62
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.5.5";
version = "2022.6.0";
components = {
"abode" = ps: with ps; [
abodepy
@ -140,6 +140,9 @@
pyatv
zeroconf
];
"application_credentials" = ps: with ps; [
aiohttp-cors
];
"apprise" = ps: with ps; [
apprise
];
@ -236,6 +239,8 @@
aiohttp-cors
securetar
];
"baf" = ps: with ps; [
]; # missing inputs: aiobafi6
"baidu" = ps: with ps; [
]; # missing inputs: baidu-aip
"balboa" = ps: with ps; [
@ -288,7 +293,7 @@
bimmer-connected
];
"bond" = ps: with ps; [
bond-api
bond-async
];
"bosch_shc" = ps: with ps; [
aiohttp-cors
@ -952,6 +957,10 @@
"geo_rss_events" = ps: with ps; [
georss-generic-client
];
"geocaching" = ps: with ps; [
aiohttp-cors
geocachingapi
];
"geofency" = ps: with ps; [
aiohttp-cors
];
@ -1049,6 +1058,16 @@
"hangouts" = ps: with ps; [
hangups
];
"hardkernel" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
"hardware" = ps: with ps; [
];
"harman_kardon_avr" = ps: with ps; [
hkavr
];
@ -1139,7 +1158,7 @@
homematicip
];
"homewizard" = ps: with ps; [
aiohwenergy
python-homewizard-energy
];
"homeworks" = ps: with ps; [
pyhomeworks
@ -1187,6 +1206,9 @@
"ialarm" = ps: with ps; [
pyialarm
];
"ialarm_xr" = ps: with ps; [
pyialarmxr
];
"iammeter" = ps: with ps; [
]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [
@ -1379,6 +1401,9 @@
"launch_library" = ps: with ps; [
pylaunches
];
"laundrify" = ps: with ps; [
laundrify-aio
];
"lcn" = ps: with ps; [
pypck
];
@ -1863,7 +1888,6 @@
ondilo
];
"onewire" = ps: with ps; [
pi1wire
pyownet
];
"onkyo" = ps: with ps; [
@ -2138,13 +2162,21 @@
];
"rainforest_eagle" = ps: with ps; [
aioeagle
ueagle
eagle100
];
"rainmachine" = ps: with ps; [
regenmaschine
];
"random" = ps: with ps; [
];
"raspberry_pi" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
"raspyrfm" = ps: with ps; [
]; # missing inputs: raspyrfm-client
"rdw" = ps: with ps; [
@ -2227,8 +2259,6 @@
];
"rpi_camera" = ps: with ps; [
];
"rpi_gpio" = ps: with ps; [
]; # missing inputs: RPi.GPIO
"rpi_power" = ps: with ps; [
rpi-bad-power
];
@ -2287,6 +2317,7 @@
"scrape" = ps: with ps; [
beautifulsoup4
jsonpath
lxml
xmltodict
];
"screenlogic" = ps: with ps; [
@ -3035,6 +3066,9 @@
];
"worxlandroid" = ps: with ps; [
];
"ws66i" = ps: with ps; [
pyws66i
];
"wsdot" = ps: with ps; [
];
"x10" = ps: with ps; [
@ -3103,6 +3137,10 @@
aioftp
ha-ffmpeg
];
"yolink" = ps: with ps; [
aiohttp-cors
yolink-api
];
"youless" = ps: with ps; [
youless-api
];
@ -3182,6 +3220,7 @@
"airtouch4"
"airvisual"
"airzone"
"aladdin_connect"
"alarm_control_panel"
"alarmdecoder"
"alert"
@ -3196,6 +3235,7 @@
"apache_kafka"
"api"
"apple_tv"
"application_credentials"
"apprise"
"aprs"
"arcam_fmj"
@ -3353,6 +3393,7 @@
"geo_json_events"
"geo_location"
"geo_rss_events"
"geocaching"
"geofency"
"geonetnz_quakes"
"geonetnz_volcano"
@ -3378,6 +3419,8 @@
"guardian"
"habitica"
"hangouts"
"hardkernel"
"hardware"
"harmony"
"hassio"
"hddtemp"
@ -3407,6 +3450,7 @@
"hvv_departures"
"hyperion"
"ialarm"
"ialarm_xr"
"iaqualink"
"icloud"
"ifttt"
@ -3447,6 +3491,7 @@
"kulersky"
"lastfm"
"launch_library"
"laundrify"
"lcn"
"light"
"litterrobot"
@ -3586,6 +3631,7 @@
"rainforest_eagle"
"rainmachine"
"random"
"raspberry_pi"
"rdw"
"recollect_waste"
"recorder"
@ -3778,6 +3824,7 @@
"wled"
"workday"
"worldclock"
"ws66i"
"wsdot"
"xbox"
"xiaomi"
@ -3789,6 +3836,7 @@
"yandex_transport"
"yandextts"
"yeelight"
"yolink"
"youless"
"zeroconf"
"zerproc"

27
pkgs/servers/home-assistant/default.nix
View file

@ -72,19 +72,6 @@ let
});
})
(self: super: {
huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
version = "1.4.18";
src = fetchFromGitHub {
owner = "Salamek";
repo = "huawei-lte-api";
rev = version;
sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.dicttoxml ];
});
})
# Pinned due to API changes in pyruckus>0.12
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@ -179,7 +166,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.5.5";
hassVersion = "2022.6.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-uVB3Yg3f0fNkq2rav7hmbJ9IAMg0UIrdMshJVgOharA=";
hash = "sha256-8s6CyTNA61UgrflpQ/RZnAPa/xI4VFdEQJnN25k3vuc=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -210,24 +197,18 @@ in python.pkgs.buildPythonApplication rec {
postPatch = let
relaxedConstraints = [
"aiohttp"
"async_timeout"
"attrs"
"awesomeversion"
"bcrypt"
"cryptography"
"httpx"
"jinja2"
"pip"
"requests"
"yarl"
"PyJWT"
];
in ''
sed -r -i \
${lib.concatStringsSep "\n" (map (package:
''-e 's@${package}[<>=]+.*@${package}@g' \''
) relaxedConstraints)}
setup.cfg
setup.cfg
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';

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 = "20220504.1";
version = "20220531.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0=";
sha256 = "sha256-NySYrHmU1OV11WZSqe6GURPKnwcLukXF0QUxxlPXUG4=";
};
# there is nothing to strip in this package

1
pkgs/servers/home-assistant/tests.nix
View file

@ -14,6 +14,7 @@ let
lovelace = [ PyChromecast ];
nest = [ av ];
onboarding = [ pymetno radios rpi-bad-power ];
raspberry_pi = [ rpi-bad-power ];
tomorrowio = [ pyclimacell ];
version = [ aioaseko ];
voicerss = [ mutagen ];

4
pkgs/servers/zigbee2mqtt/default.nix
View file

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
in
package.override rec {
version = "1.25.1";
version = "1.25.2";
reconstructLock = true;
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "IMRpT4BQvnsk8rl2bxiUbzVp4UcEaPLsniKneOq7Av4=";
sha256 = "E7D2lAXEgi0Vy9sVUzsLxY6G06hnUQxergCAOcSvDng=";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

2329
pkgs/servers/zigbee2mqtt/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

2
pkgs/servers/zigbee2mqtt/node.nix
View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

4
pkgs/stdenv/generic/check-meta.nix
View file

@ -98,10 +98,10 @@ let
# Allow granular checks to allow only some non-source-built packages
# Example:
# {pkgs, ...}:
# { pkgs, ... }:
# {
# allowNonSource = false;
# allowNonSourcePredicate = with lib.lists; pkg: !(any (p: !p.isSource && p!=lib.sourceTypes.binaryFirmware) (toList pkg.meta.sourceProvenance));
# allowNonSourcePredicate = with pkgs.lib.lists; pkg: !(any (p: !p.isSource && p != lib.sourceTypes.binaryFirmware) (toList pkg.meta.sourceProvenance));
# }
allowNonSourcePredicate = config.allowNonSourcePredicate or (x: false);

1
pkgs/tools/X11/xpra/default.nix
View file

@ -135,7 +135,6 @@ in buildPythonApplication rec {
dbus-python
gst-python
idna
ipaddress
lz4
netifaces
numpy

1
pkgs/tools/admin/azure-cli/default.nix
View file

@ -159,7 +159,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
javaproperties
jsondiff
# urllib3[secure]
ipaddress
# shell completion
argcomplete
];

91
pkgs/tools/admin/tigervnc/default.nix
View file

@ -1,10 +1,24 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, xorg, xkeyboard_config, zlib
, libjpeg_turbo, pixman, fltk
, cmake, gettext, libtool
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, xorg
, xkeyboard_config
, zlib
, libjpeg_turbo
, pixman
, fltk
, cmake
, gettext
, libtool
, libGLU
, gnutls, pam, nettle
, xterm, openssh, perl
, gnutls
, gawk
, pam
, nettle
, xterm
, openssh
, perl
, makeWrapper
, nixosTests
}:
@ -31,7 +45,7 @@ stdenv.mkDerivation rec {
})
];
postPatch = ''
postPatch = lib.optionalString stdenv.isLinux ''
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in
fontPath=
substituteInPlace vncviewer/vncviewer.cxx \
@ -39,6 +53,10 @@ stdenv.mkDerivation rec {
cp unix/xserver21.1.1.patch unix/xserver211.patch
source_top="$(pwd)"
'' + ''
# On Mac, do not build a .dmg, instead copy the .app to the source dir
gawk -i inplace 'BEGIN { del=0 } /hdiutil/ { del=2 } del<=0 { print } /$VERSION.dmg/ { del -= 1 }' release/makemacapp.in
echo "mv \"\$APPROOT\" \"\$SRCDIR/\"" >> release/makemacapp.in
'';
dontUseCmakeBuildDir = true;
@ -49,7 +67,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin"
];
postBuild = ''
postBuild = lib.optionalString stdenv.isLinux ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast"
export CXXFLAGS="$CXXFLAGS -fpermissive"
# Build Xvnc
@ -76,9 +94,11 @@ stdenv.mkDerivation rec {
--with-xkb-output=$out/share/X11/xkb/compiled
make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
popd
'' + lib.optionalString stdenv.isDarwin ''
make dmg
'';
postInstall = ''
postInstall = lib.optionalString stdenv.isLinux ''
pushd unix/xserver/hw/vnc
make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../../../.. install
popd
@ -86,21 +106,54 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/vncserver \
--prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv 'TigerVNC Viewer ${version}.app' $out/Applications/
rm $out/bin/vncviewer
echo "#!/usr/bin/env bash
open $out/Applications/TigerVNC\ Viewer\ ${version}.app --args \$@" >> $out/bin/vncviewer
chmod +x $out/bin/vncviewer
'';
buildInputs = with xorg; [
libjpeg_turbo fltk pixman
gnutls pam nettle perl
buildInputs = [
fltk
gnutls
libjpeg_turbo
pixman
gawk
] ++ lib.optionals stdenv.isLinux (with xorg; [
nettle
pam
perl
xorgproto
utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft
libxkbfile libXfont2 libpciaccess
utilmacros
libXtst
libXext
libX11
libXext
libICE
libXi
libSM
libXft
libxkbfile
libXfont2
libpciaccess
libGLU
] ++ xorg.xorgserver.buildInputs;
] ++ xorg.xorgserver.buildInputs
);
nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ]
++ xorg.xorgserver.nativeBuildInputs;
nativeBuildInputs = [
cmake
gettext
] ++ lib.optionals stdenv.isLinux (with xorg; [
fontutil
libtool
makeWrapper
utilmacros
zlib
] ++ xorg.xorgserver.nativeBuildInputs);
propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
propagatedBuildInputs = lib.optional stdenv.isLinux xorg.xorgserver.propagatedBuildInputs;
passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC;
@ -109,7 +162,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
description = "Fork of tightVNC, made in cooperation with VirtualGL";
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
platforms = lib.platforms.unix;
# Prevent a store collision.
priority = 4;
};

12
pkgs/tools/audio/beets/common.nix
View file

@ -27,13 +27,13 @@
let
inherit (lib) attrNames attrValues concatMap;
builtinPlugins = import ./builtin-plugins.nix inputs;
mkPlugin = { enable ? !disableAllPlugins, propagatedBuildInputs ? [ ], testPaths ? [ ], wrapperBins ? [ ] }: {
inherit enable propagatedBuildInputs testPaths wrapperBins;
mkPlugin = { enable ? !disableAllPlugins, builtin ? false, propagatedBuildInputs ? [ ], testPaths ? [ ], wrapperBins ? [ ] }: {
inherit enable builtin propagatedBuildInputs testPaths wrapperBins;
};
allPlugins = lib.mapAttrs (_: mkPlugin) (lib.recursiveUpdate builtinPlugins pluginOverrides);
basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
allPlugins = lib.mapAttrs (_: mkPlugin) (lib.recursiveUpdate basePlugins pluginOverrides);
builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
@ -117,7 +117,7 @@ python3Packages.buildPythonApplication rec {
\( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
| sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
| sort -u > plugins_available
${diffPlugins (attrNames allPlugins) "plugins_available"}
${diffPlugins (attrNames builtinPlugins) "plugins_available"}
export BEETS_TEST_SHELL="${bashInteractive}/bin/bash --norc"
export HOME="$(mktemp -d)"

2
pkgs/tools/audio/beets/default.nix
View file

@ -40,7 +40,7 @@ lib.makeExtensible (self: {
};
pluginOverrides = {
# unstable has a new plugin, so we register it here.
limit = { };
limit = { builtin = true; };
};
};

3
pkgs/tools/backup/duplicity/default.nix
View file

@ -78,15 +78,12 @@ pythonPackages.buildPythonApplication rec {
idna
pygobject3
fasteners
ipaddress
lockfile
paramiko
pyasn1
pycrypto
pydrive2
future
] ++ lib.optionals (!isPy3k) [
enum
];
checkInputs = [

8
pkgs/tools/misc/btdu/default.nix
View file

@ -1,23 +1,23 @@
{stdenv, lib, fetchurl, dub, ncurses, ldc, zlib, removeReferencesTo }:
let
_d_ae_ver = "0.0.3100";
_d_ae_ver = "0.0.3141";
_d_btrfs_ver = "0.0.12";
_d_ncurses_ver = "0.0.149";
_d_emsi_containers_ver = "0.9.0";
in
stdenv.mkDerivation rec {
pname = "btdu";
version = "0.3.1";
version = "0.4.0";
srcs = [
(fetchurl {
url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz";
sha256 = "760b2f0d28920a78b7967dd34c429125135688a3aefc57ab3a92d07bc3ef10cb";
sha256 = "1377d2ee14367deed6f0b17407a0de437450a4f381819265d98c38fbc05f792f";
})
(fetchurl {
url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz";
sha256 = "86fa09ef6c1be4cbe8ad1c85729054e5d691b41ff57c7980d99937ec0f45b950";
sha256 = "5ae60c637050c11733da8a67735a43e16d6082d18b74ce64b04e24e42d8f5f5f";
})
(fetchurl {
url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz";

6
pkgs/tools/misc/hexyl/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hexyl";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hLDx5OzCE5iA492V3+dhaav2l8/rOVWyskrU4Gz1hf4=";
sha256 = "sha256-LskDHUm45OlWbzlumaIXPXCZEBA5dXanhzgAvenJgVk=";
};
cargoSha256 = "sha256-CGaCMrShagK4dAdwJtaeUMJlYOlG/cH+6E1QDYGrqL0=";
cargoSha256 = "sha256-qKk95hGcThu0y3ND9z3mXw1TBaVkwAOrznaqj2k3SEk=";
meta = with lib; {
changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";

2
pkgs/tools/misc/yle-dl/default.nix
View file

@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://aajanki.github.io/yle-dl/";
changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg SuperSandro2000 ];
maintainers = with maintainers; [ dezgeg ];
platforms = platforms.unix;
};
}

1
pkgs/tools/networking/dd-agent/5.nix
View file

@ -18,7 +18,6 @@ let
six
requests
websocket-client
ipaddress
docker_pycreds
uptime
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];

18
pkgs/tools/networking/wget2/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
# build support
, autoreconfHook
, flex
@ -27,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wget2";
version = "2.0.0";
version = "2.0.1";
outputs = [ "out" "lib" "dev" ];
@ -35,22 +34,9 @@ stdenv.mkDerivation rec {
owner = "gnuwget";
repo = pname;
rev = "v${version}";
sha256 = "07zs2x2k62836l0arzc333j96yjpwal1v4mr8j99x6qxgmmssrbj";
sha256 = "sha256-9IOM8IA8Kezk3SP3YVenxQkm8UMZgD8/ztWoDNqM0vc=";
};
patches = [
(fetchpatch {
name = "fix-bashism-in-configure-ac.patch";
url = "https://gitlab.com/gnuwget/wget2/-/commit/da9788f5d62b89ba796393d9bc496b1d8d7a7b30.patch";
sha256 = "0bn3vkgyknks7jzs5722s2c4qlx7k5lwfiyz204bi42v1m28s1a5";
})
(fetchpatch {
name = "fix-double-quotes-in-configure-ac.patch";
url = "https://gitlab.com/gnuwget/wget2/-/commit/574c8ae08dfd8949da039879d85899123d31ab1d.patch";
sha256 = "14rfmij5w3bvj0fnkkkrxg0lfw3vgwiyvbkal3nqhgb0mlhlmd47";
})
];
# wget2_noinstall contains forbidden reference to /build/
postPatch = ''
substituteInPlace src/Makefile.am \

6
pkgs/tools/networking/xh/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "xh";
version = "0.15.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
sha256 = "sha256-+GiVehgU0g/rHeikSyACbTdCdpjHd8WxjkP+uxCylnY=";
sha256 = "sha256-y+Bixr+WRoTGjenkHSLbVmb9IHr9nicrAWyvkg5ey8E=";
};
cargoSha256 = "sha256-G3jaM6U7O+GLAiAbaWMIyh6Ksu4ypTK50s/RNe2wT3c=";
cargoSha256 = "sha256-wyK10D9MMyNF+JSacWW6GQcaMYMbDf1PHhuZ5LwZo+I=";
buildFeatures = lib.optional withNativeTls "native-tls";

6
pkgs/tools/system/localtime/default.nix
View file

@ -1,6 +1,5 @@
{ buildGoModule
, fetchFromGitHub
, geoclue2-with-demo-agent
, lib
, m4
}:
@ -18,11 +17,6 @@ buildGoModule {
vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU=";
postPatch = ''
demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"
sed -i localtimed.go -e "s#/usr/lib/geoclue-2.0/demos/agent#$demoPath#"
'';
nativeBuildInputs = [ m4 ];
installPhase = ''

17
pkgs/tools/text/mdcat/default.nix
View file

@ -12,21 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "0.26.1";
version = "0.27.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = "mdcat";
rev = "mdcat-${version}";
sha256 = "sha256-vB49EwQltonR9Uw8RRMZTPR4WkcylnIqiE0/8+t2R1Q=";
sha256 = "sha256-iWFWpUyg/VYI+AKFsJe/rOYco+680l/bIHX0qXfD3u0=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-v52ob5l5HiiZZmo88D9/ldFi0170/BuPzgKIt9ctSgU=";
cargoSha256 = "sha256-e/yupkCqWZZCfD8brVb2yD4pt3ExSfwCm2bmTyjRGpA=";
checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
@ -43,15 +43,16 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installManPage $releaseDir/build/mdcat-*/out/mdcat.1
installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash
installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish
installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
installShellCompletion \
--bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash \
--fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish \
--zsh $releaseDir/build/mdcat-*/out/completions/_mdcat
'';
meta = with lib; {
description = "cat for markdown";
homepage = "https://github.com/lunaryorn/mdcat";
homepage = "https://codeberg.org/flausch/mdcat";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ davidtwco SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -27073,6 +27073,8 @@ with pkgs;
hugo = callPackage ../applications/misc/hugo { buildGoModule = buildGo118Module; };
gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
go-org = callPackage ../applications/misc/go-org { };
hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };

3
pkgs/top-level/python-aliases.nix
View file

@ -108,6 +108,7 @@ mapAliases ({
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
@ -160,6 +161,8 @@ mapAliases ({
tensorflow-tensorboard = tensorboard; # added 2022-03-06
tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
websocket_client = websocket-client; # added 2021-06-15

18
pkgs/top-level/python-packages.nix
View file

@ -1325,6 +1325,8 @@ in {
bond-api = callPackage ../development/python-modules/bond-api { };
bond-async = callPackage ../development/python-modules/bond-async { };
booleanoperations = callPackage ../development/python-modules/booleanoperations { };
boolean-py = callPackage ../development/python-modules/boolean-py { };
@ -6391,6 +6393,8 @@ in {
micloud = callPackage ../development/python-modules/micloud { };
msgraph-core = callPackage ../development/python-modules/msgraph-core { };
netmap = callPackage ../development/python-modules/netmap { };
openai = callPackage ../development/python-modules/openai { };
@ -7196,8 +7200,6 @@ in {
inherit (pkgs) graphviz;
};
pydrive = callPackage ../development/python-modules/pydrive { };
pydrive2 = callPackage ../development/python-modules/pydrive2 { };
pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
@ -7410,6 +7412,8 @@ in {
pyialarm = callPackage ../development/python-modules/pyialarm { };
pyialarmxr = callPackage ../development/python-modules/pyialarmxr { };
pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { };
@ -8450,6 +8454,8 @@ in {
python-hglib = callPackage ../development/python-modules/python-hglib { };
python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { };
python-hosts = callPackage ../development/python-modules/python-hosts { };
python-hpilo = callPackage ../development/python-modules/python-hpilo { };
@ -8841,6 +8847,8 @@ in {
pywlroots = callPackage ../development/python-modules/pywlroots { };
pyws66i = callPackage ../development/python-modules/pyws66i { };
pyxattr = callPackage ../development/python-modules/pyxattr { };
pyworld = callPackage ../development/python-modules/pyworld { };
@ -10648,8 +10656,6 @@ in {
typer = callPackage ../development/python-modules/typer { };
types-cryptography = callPackage ../development/python-modules/types-cryptography { };
types-dateutil = callPackage ../development/python-modules/types-dateutil { };
types-decorator = callPackage ../development/python-modules/types-decorator { };
@ -10664,8 +10670,6 @@ in {
types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
types-paramiko = callPackage ../development/python-modules/types-paramiko { };
types-protobuf = callPackage ../development/python-modules/types-protobuf { };
types-pytz = callPackage ../development/python-modules/types-pytz { };
@ -11362,6 +11366,8 @@ in {
yoda = toPythonModule (pkgs.yoda.override { inherit python; });
yolink-api = callPackage ../development/python-modules/yolink-api { };
youless-api = callPackage ../development/python-modules/youless-api { };
youtube-dl = callPackage ../tools/misc/youtube-dl { };