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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-11 18:01:13 +00:00 committed by GitHub
commit f2d7271432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
96 changed files with 1224 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -614,7 +614,7 @@ Superuser created successfully.
<listitem>
<para>
The <literal>staticjinja</literal> package has been upgraded
from 1.0.4 to 4.1.0
from 1.0.4 to 4.1.1
</para>
</listitem>
<listitem>

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

@ -202,7 +202,7 @@ In addition to numerous new and upgraded packages, this release has the followin
Superuser created successfully.
```
- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0
- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.1
- Firefox v91 does not support addons with invalid signature anymore. Firefox ESR needs to be used for nix addon support.

5
nixos/maintainers/scripts/ec2/amazon-image.nix
View File

@ -4,6 +4,7 @@ with lib;
let
cfg = config.amazonImage;
amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
in {
@ -106,10 +107,12 @@ in {
--arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
--arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg boot_mode "${amiBootMode}" \
--arg root "$rootDisk" \
--arg boot "$bootDisk" \
'{}
| .label = $system_label
| .boot_mode = $boot_mode
| .system = $system
| .disks.boot.logical_bytes = $boot_logical_bytes
| .disks.boot.file = $boot
@ -145,9 +148,11 @@ in {
--arg system_label ${lib.escapeShellArg config.system.nixos.label} \
--arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
--arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
--arg boot_mode "${amiBootMode}" \
--arg file "$diskImage" \
'{}
| .label = $system_label
| .boot_mode = $boot_mode
| .system = $system
| .logical_bytes = $logical_bytes
| .file = $file

4
nixos/maintainers/scripts/ec2/create-amis.sh
View File

@ -1,6 +1,9 @@
#!/usr/bin/env nix-shell
#!nix-shell -p awscli -p jq -p qemu -i bash
# shellcheck shell=bash
#
# Future Deprecation?
# This entire thing should probably be replaced with a generic terraform config
# Uploads and registers NixOS images built from the
# <nixos/release.nix> amazonImage attribute. Images are uploaded and
@ -275,6 +278,7 @@ upload_image() {
--region "$region" \
--architecture $amazon_arch \
--block-device-mappings "${block_device_mappings[@]}" \
--boot-mode $(read_image_info .boot_mode) \
"${extra_flags[@]}" \
| jq -r '.ImageId'
)

18
nixos/modules/services/web-apps/plausible.nix
View File

@ -9,6 +9,14 @@ in {
options.services.plausible = {
enable = mkEnableOption "plausible";
releaseCookiePath = mkOption {
default = null;
type = with types; nullOr (either str path);
description = ''
The path to the file with release cookie. (used for remote connection to the running node).
'';
};
adminUser = {
name = mkOption {
default = "admin";
@ -173,6 +181,8 @@ in {
services.epmd.enable = true;
environment.systemPackages = [ pkgs.plausible ];
systemd.services = mkMerge [
{
plausible = {
@ -197,6 +207,8 @@ in {
DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration;
RELEASE_TMP = "/var/lib/plausible/tmp";
# Home is needed to connect to the node with iex
HOME = "/var/lib/plausible";
ADMIN_USER_NAME = cfg.adminUser.name;
ADMIN_USER_EMAIL = cfg.adminUser.email;
@ -231,6 +243,9 @@ in {
psql -d plausible <<< "UPDATE users SET email_verified=true;"
fi
''}
${optionalString (cfg.releaseCookiePath != null) ''
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
''}
plausible start
'';
@ -242,7 +257,8 @@ in {
LoadCredential = [
"ADMIN_USER_PWD:${cfg.adminUser.passwordFile}"
"SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}"
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"];
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]
++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"];
};
};
}

3
nixos/modules/services/web-apps/zabbix.nix
View File

@ -21,7 +21,8 @@ let
$DB['PORT'] = '${toString cfg.database.port}';
$DB['DATABASE'] = '${cfg.database.name}';
$DB['USER'] = '${cfg.database.user}';
$DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "file_get_contents('${cfg.database.passwordFile}')" else "''"};
# NOTE: file_get_contents adds newline at the end of returned string
$DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")" else "''"};
// Schema name. Used for IBM DB2 and PostgreSQL.
$DB['SCHEMA'] = ''';
$ZBX_SERVER = '${cfg.server.address}';

33
pkgs/applications/audio/aether-lv2/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }:
stdenv.mkDerivation rec {
pname = "aether-lv2";
version = "1.2.1";
src = fetchFromGitHub {
owner = "Dougal-s";
repo = "aether";
rev = "v${version}";
sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [
lv2 libX11 libGL libGLU mesa
];
installPhase = ''
mkdir -p $out/lib/lv2
cp -r aether.lv2 $out/lib/lv2
'';
meta = with lib; {
homepage = "https://dougal-s.github.io/Aether/";
description = "An algorithmic reverb LV2 based on Cloudseed";
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
license = licenses.mit;
};
}

4
pkgs/applications/audio/faustPhysicalModeling/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "faustPhysicalModeling";
version = "2.33.1";
version = "2.37.3";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk=";
sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U=";
};
buildInputs = [ faust2jaqt faust2lv2 ];

6
pkgs/applications/audio/sublime-music/default.nix
View File

@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "sublime-music";
version = "0.11.14";
version = "0.11.16";
format = "pyproject";
src = fetchFromGitLab {
owner = "sublime-music";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NzbQtRcsRVppyuG1UuS3IidSnniUOavf5YoAf/kcZqw=";
sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg=";
};
nativeBuildInputs = [
@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec {
];
checkPhase = ''
${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload"
${xvfb-run}/bin/xvfb-run pytest
'';
pythonImportsCheck = [

33
pkgs/applications/audio/surge-XT/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2
}:
stdenv.mkDerivation rec {
pname = "surge-XT";
version = "unstable-2021-11-07";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = "surge";
rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5";
sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ];
installPhase = ''
cd ..
cmake --build build --config Release --target install
'';
doInstallCheck = false;
meta = with lib; {
description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
homepage = "https://surge-synthesizer.github.io";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ magnetophon orivej ];
};
}

19
pkgs/applications/graphics/smartdeblur/default.nix
View File

@ -1,13 +1,14 @@
{ fetchurl, lib, stdenv, cmake, qt4, fftw }:
{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }:
stdenv.mkDerivation rec {
pname = "smartdeblur";
version = "unstable-2013-01-09";
src = fetchurl {
url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26";
name = "smartdeblur-${version}.tar.gz";
sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4";
src = fetchFromGitHub {
owner = "Y-Vladimir";
repo = "SmartDeblur";
rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e";
sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw=";
};
preConfigure = ''
@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ];
meta = {
meta = with lib; {
homepage = "https://github.com/Y-Vladimir/SmartDeblur";
description = "Tool for restoring blurry and defocused images";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ];
platforms = with lib.platforms; linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

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

@ -1,10 +1,7 @@
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12,
alsa-lib, gtk3, libxshmfence, mesa, nss, popt }:
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }:
let
electron = electron_12;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "binance";
version = "1.26.0";

1
pkgs/applications/networking/cluster/helm-docs/default.nix
View File

@ -23,7 +23,6 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://github.com/norwoodj/helm-docs";
description = "A tool for automatically generating markdown documentation for Helm charts";
platforms = platforms.unix;
license = licenses.gpl3Only;
maintainers = with maintainers; [ sagikazarmark ];
};

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

@ -195,9 +195,9 @@ rec {
};
terraform_1_0 = mkTerraform {
version = "1.0.10";
sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb";
vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
version = "1.0.11";
sha256 = "0k05s4zm16vksq21f1q00y2lzfgi5fhs1ygydm8jk0srs9x8ask7";
vendorSha256 = "1brgghl7fb26va4adix443rl1dkjaqrr4jkknxjkcaps0knqp172";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};

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

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.1.149";
version = "3.1.150";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg";
sha256 = "sha256-tSA1pDGzIX2uIEWM0xV53jj1vBcJFMNCRakczs7Hue4=";
};
postPatch = ''

6
pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-09-10";
version = "unstable-2021-10-27";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "40092aa096bac7e279eb5a4cc97758bac484236c";
sha256 = "0vmsbxx4hxh35v1lbj82vq2w8z8inj83xpf24wzlbdr9inlbmym4";
rev = "e1201cdcce4311061643d90cc0132745023a82d2";
sha256 = "04xqvyj4rzgl9r7sfjjw1kc3vql30c80rwppff2zr5aijr15fgjj";
};
nativeBuildInputs = [

1
pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation {
pillow
urllib3
aiofiles
notify2
]))];
installPhase = ''

11
pkgs/applications/science/logic/logisim-evolution/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logisim-evolution";
version = "3.5.0";
version = "3.7.1";
src = fetchurl {
url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar";
sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw";
sha256 = "04q9bzhnzpi8cgv3ly4ii88qvmlw9n09c4p1qmg8dhxqkskdqj6h";
};
dontUnpack = true;
@ -30,8 +30,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src"
unzip $src resources/logisim/img/logisim-icon.svg
install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg
# Create icons
unzip $src "resources/logisim/img/*"
for size in 16 32 48 128 256; do
install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim-evolution.png"
done
runHook postInstall
'';

2
pkgs/applications/terminal-emulators/tilix/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "${version}";
rev = version;
sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
};

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -112,10 +112,6 @@ stdenv.mkDerivation rec {
})
] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch
++ lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch";
sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k";
})
./sigrtminmax.patch
(fetchpatch {
url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch";

3
pkgs/data/fonts/vista-fonts/default.nix
View File

@ -14,11 +14,12 @@ stdenvNoCC.mkDerivation {
unpackPhase = ''
cabextract --lowercase --filter ppviewer.cab $src
cabextract --lowercase --filter '*.TTF' ppviewer.cab
cabextract --lowercase --filter '*.TTC' ppviewer.cab
'';
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
cp *.ttf *.ttc $out/share/fonts/truetype
# Set up no-op font configs to override any aliases set up by
# other packages.

37
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch vendored Normal file
View File

@ -0,0 +1,37 @@
From c9aaff2461daba31a25ed20c0789ffd7c3561887 Mon Sep 17 00:00:00 2001
From: Pasquale <p3dimaria@hotmail.it>
Date: Tue, 9 Nov 2021 23:12:50 +0100
Subject: [PATCH] Avoid usage of npx
tsc is only used for checking type annotation
that are stripped by esbuild
---
src/kwinscript/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt
index 6d85d5d..6f966a4 100644
--- a/src/kwinscript/CMakeLists.txt
+++ b/src/kwinscript/CMakeLists.txt
@@ -29,7 +29,7 @@ add_custom_target(
add_custom_command(
OUTPUT "bismuth/contents/code/index.mjs"
- COMMAND "npx" "esbuild"
+ COMMAND "esbuild"
"--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts"
"--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs"
"--format=esm"
@@ -40,7 +40,7 @@ add_custom_command(
add_custom_target(
LintViaTSC
- COMMAND "npx" "tsc" "--noEmit" "--incremental"
+ COMMAND "true"
COMMENT "👮 Checking sources using TS Compiler..."
)
--
2.33.1

48
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix vendored Normal file
View File

@ -0,0 +1,48 @@
{ lib
, mkDerivation
, fetchFromGitHub
, kcoreaddons
, kwindowsystem
, plasma-framework
, systemsettings
, cmake
, extra-cmake-modules
, esbuild
}:
mkDerivation rec {
pname = "bismuth";
version = "2.1.0";
src = fetchFromGitHub {
owner = "Bismuth-Forge";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ICpGgFvVi7tiYbMCo3JWQmbA36rdWF4NFYTWIejhxr4=";
};
patches = [
./0001-Avoid-usage-of-npx.patch
];
nativeBuildInputs = [
cmake
extra-cmake-modules
esbuild
];
buildInputs = [
kcoreaddons
kwindowsystem
plasma-framework
systemsettings
];
meta = with lib; {
description = "A dynamic tiling extension for KWin";
license = licenses.mit;
maintainers = with maintainers; [ pasqui23 ];
homepage = "https://bismuth-forge.github.io/bismuth/";
inherit (kwindowsystem.meta) platforms;
};
}

1
pkgs/desktops/plasma-5/default.nix
View File

@ -155,6 +155,7 @@ let
thirdParty = let inherit (libsForQt5) callPackage; in {
plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
bismuth = callPackage ./3rdparty/addons/bismuth { };
kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };

6
pkgs/development/compilers/ldc/binary.nix
View File

@ -3,8 +3,8 @@
let
inherit (stdenv) hostPlatform;
OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
ARCH = toString hostPlatform.parsed.cpu.name;
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
in stdenv.mkDerivation {
pname = "ldc-bootstrap";
inherit version;
@ -37,6 +37,6 @@ in stdenv.mkDerivation {
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
};
}

9
pkgs/development/compilers/ldc/bootstrap.nix
View File

@ -1,10 +1,11 @@
{ callPackage }:
callPackage ./binary.nix {
version = "1.19.0";
version = "1.25.0";
hashes = {
# Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7";
linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h";
linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3";
osx-x86_64 = "1xaqxf1lz8kdb0n5iycfpxpvabf1zy0akg14kg554sm85xnsf8pa";
linux-x86_64 = "1shzdq564jg3ga1hwrvpx30lpszc6pqndqndr5mqmc352znkiy5i";
linux-aarch64 = "04i4xxwhq02d98r3qrrnv5dbd4xr4d7ph3zv94z2m58z3vgphdjh";
osx-arm64 = "0b0cpgzn23clggx0cvdaja29q7w7ihkmjbnf1md03h9h5nzp9z1v";
};
}

2
pkgs/development/compilers/ldc/generic.nix
View File

@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

35
pkgs/development/libraries/collada-dom/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, lib, fetchFromGitHub, cmake, boost, libxml2, minizip, readline }:
stdenv.mkDerivation {
pname = "collada-dom";
version = "unstable-2020-01-03";
src = fetchFromGitHub {
owner = "rdiankov";
repo = "collada-dom";
rev = "c1e20b7d6ff806237030fe82f126cb86d661f063";
sha256 = "sha256-A1ne/D6S0shwCzb9spd1MoSt/238HWA8dvgd+DC9cXc=";
};
postInstall = ''
chmod +w -R $out
ln -s $out/include/*/* $out/include
'';
nativeBuildInputs = [ cmake ];
buildInputs = [
boost
libxml2
minizip
readline
];
meta = with lib; {
description = "Lightweight version of collada-dom, with only the parser.";
homepage = "https://github.com/rdiankov/collada-dom";
license = licenses.mit;
maintainers = with maintainers; [ marius851000 ];
platforms = platforms.all;
};
}

11
pkgs/development/libraries/giflib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }:
stdenv.mkDerivation rec {
name = "giflib-5.2.1";
@ -19,12 +19,21 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Makefile \
--replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}'
''
# Upstream build system does not support NOT building shared libraries.
+ lib.optionalString stdenv.hostPlatform.isStatic ''
sed -i '/all:/ s/libgif.so//' Makefile
sed -i '/all:/ s/libutil.so//' Makefile
sed -i '/-m 755 libgif.so/ d' Makefile
sed -i '/ln -sf libgif.so/ d' Makefile
'';
nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
passthru.tests.static = pkgsStatic.giflib;
meta = {
description = "A library for reading and writing gif images";
platforms = lib.platforms.unix;

2
pkgs/development/libraries/glog/default.nix
View File

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
description = "Library for application-level logging";
platforms = platforms.unix;
maintainers = with lib.maintainers; [ nh2 r-burns ];
maintainers = with maintainers; [ nh2 r-burns ];
};
}

2
pkgs/development/libraries/libbsd/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# darwin changes configure.ac which means we need to regenerate
# the configure scripts
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libmd ];
propagatedBuildInputs = [ libmd ];
patches = [ ./darwin.patch ];

53
pkgs/development/libraries/libdeltachat/darwin-dylib.patch Normal file
View File

@ -0,0 +1,53 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ed8020c..44ca43e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16)
project(deltachat LANGUAGES C)
include(GNUInstallDirs)
+if(APPLE)
+ set(DYNAMIC_EXT "dylib")
+elseif(UNIX)
+ set(DYNAMIC_EXT "so")
+else()
+ set(DYNAMIC_EXT "dll")
+endif()
+
find_program(CARGO cargo)
add_custom_command(
OUTPUT
"target/release/libdeltachat.a"
- "target/release/libdeltachat.so"
+ "target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
COMMAND
PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -32,11 +40,11 @@ add_custom_target(
ALL
DEPENDS
"target/release/libdeltachat.a"
- "target/release/libdeltachat.so"
+ "target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
)
install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py
index c8ed43e2..714c7e30 100755
--- a/python/install_python_bindings.py
+++ b/python/install_python_bindings.py
@@ -24,7 +24,7 @@
print("running:", " ".join(cmd))
subprocess.check_call(cmd)
- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True)
+ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True)
if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
subprocess.check_call([

17
pkgs/development/libraries/libdeltachat/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, openssl
, perl
@ -16,33 +15,25 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.60.0";
version = "1.63.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2";
sha256 = "1511jh38h7nmn4dpyi1vfxvhybcacc6gavwfifxvb5npirphziga";
};
patches = [
# https://github.com/deltachat/deltachat-core-rust/pull/2589
(fetchpatch {
url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch";
sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59";
})
./darwin-dylib.patch
./no-static-lib.patch
# https://github.com/deltachat/deltachat-core-rust/pull/2660
(fetchpatch {
url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch";
sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x";
})
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1";
sha256 = "0hfp2k84mvq11h7q96hkcj3k6f3sxw8wx89acg4hy6lbh8xpy6ai";
};
nativeBuildInputs = [

9
pkgs/development/libraries/libdeltachat/no-static-lib.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe7abe08..acdbe0d6 100644
index 44ca43e7..8b6960dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@ find_program(CARGO cargo)
@@ -14,7 +14,6 @@ find_program(CARGO cargo)
add_custom_command(
OUTPUT
@ -10,7 +10,7 @@ index fe7abe08..acdbe0d6 100644
"target/release/libdeltachat.${DYNAMIC_EXT}"
"target/release/pkgconfig/deltachat.pc"
COMMAND
@@ -38,13 +37,11 @@ add_custom_target(
@@ -39,12 +38,10 @@ add_custom_target(
lib_deltachat
ALL
DEPENDS
@ -19,13 +19,12 @@ index fe7abe08..acdbe0d6 100644
"target/release/pkgconfig/deltachat.pc"
)
include(GNUInstallDirs)
install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
index a34a27ba..cf354abb 100644
index de0fbafe..120efec9 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"]

10
pkgs/development/libraries/openscenegraph/default.nix
View File

@ -2,6 +2,7 @@
libX11, libXinerama, libXrandr, libGLU, libGL,
glib, ilmbase, libxml2, pcre, zlib,
AGL, Carbon, Cocoa, Foundation,
boost,
jpegSupport ? true, libjpeg,
exrSupport ? false, openexr,
gifSupport ? true, giflib,
@ -9,7 +10,7 @@
tiffSupport ? true, libtiff,
gdalSupport ? false, gdal,
curlSupport ? true, curl,
colladaSupport ? false, opencollada,
colladaSupport ? false, collada-dom,
opencascadeSupport ? false, opencascade,
ffmpegSupport ? false, ffmpeg,
nvttSupport ? false, nvidia-texture-tools,
@ -20,7 +21,7 @@
lasSupport ? false, libLAS,
luaSupport ? false, lua,
sdlSupport ? false, SDL2,
restSupport ? false, asio, boost,
restSupport ? false, asio,
withApps ? false,
withExamples ? false, fltk, wxGTK,
}:
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
++ lib.optional tiffSupport libtiff
++ lib.optional gdalSupport gdal
++ lib.optional curlSupport curl
++ lib.optional colladaSupport opencollada
++ lib.optional colladaSupport collada-dom
++ lib.optional opencascadeSupport opencascade
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional nvttSupport nvidia-texture-tools
@ -59,9 +60,10 @@ stdenv.mkDerivation rec {
++ lib.optional lasSupport libLAS
++ lib.optional luaSupport lua
++ lib.optional sdlSupport SDL2
++ lib.optionals restSupport [ asio boost ]
++ lib.optional restSupport asio
++ lib.optionals withExamples [ fltk wxGTK ]
++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
++ lib.optional (restSupport || colladaSupport) boost
;
cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";

27
pkgs/development/libraries/recastnavigation/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }:
stdenv.mkDerivation rec {
pname = "recastai";
# use latest revision for the CMake build process and OpenMW
# OpenMW use e75adf86f91eb3082220085e42dda62679f9a3ea
version = "unstable-2021-03-05";
src = fetchFromGitHub {
owner = "recastnavigation";
repo = "recastnavigation";
rev = "c5cbd53024c8a9d8d097a4371215e3342d2fdc87";
sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libGL SDL2 libGLU ];
meta = with lib; {
homepage = "https://github.com/recastnavigation/recastnavigation";
description = "Navigation-mesh Toolset for Games";
license = licenses.zlib;
maintainers = with maintainers; [ marius851000 ];
platforms = platforms.all;
};
}

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "authheaders";
version = "0.13.0";
version = "0.14.1";
src = fetchPypi {
inherit pname version;
sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692";
sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2";
};
propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ]

4
pkgs/development/python-modules/azure-mgmt-authorization/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-authorization";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752";
sha256 = "0776edc4980be940a8602eefc0372b4d1a1fa26caa46e3c0234e0c7a0feda4ec";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
version = "9.0.0";
version = "9.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff";
sha256 = "22164b0c59138b37bc48ba6d476bf635152bc428dcb420b521a14b8c25c797ad";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-network/default.nix
View File

@ -10,14 +10,14 @@
}:
buildPythonPackage rec {
version = "19.1.0";
version = "19.2.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b";
sha256 = "c8da1cf9523b89d4b268546ea087153372633962e31a4e6befae20d0ae308bac";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
version = "2.0.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac";
sha256 = "1992486b28ddd6d4f597fd3004217cd2caf4f4dc8a0ce71226b5ae767ace3a18";
};
propagatedBuildInputs = [

1
pkgs/development/python-modules/cirq-rigetti/default.nix
View File

@ -34,6 +34,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "attrs~=20.3.0" "attrs" \
--replace "certifi~=2021.5.30" "certifi" \
--replace "h11~=0.9.0" "h11" \
--replace "httpcore~=0.11.1" "httpcore" \
--replace "httpx~=0.15.5" "httpx" \

15
pkgs/development/python-modules/dask/default.nix
View File

@ -5,6 +5,7 @@
, cloudpickle
, distributed
, fetchFromGitHub
, fetchpatch
, fsspec
, jinja2
, numpy
@ -22,7 +23,7 @@
buildPythonPackage rec {
pname = "dask";
version = "2021.09.1";
version = "2021.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -31,9 +32,19 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
sha256 = "sha256-+UkbXbWV5R/QtVb5rWm/5SA+IoWsIfBciL3vg138jkc=";
sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p";
};
patches = [
# remove with next bump
(fetchpatch {
name = "fix-tests-against-distributed-2021.10.0.patch";
url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch";
includes = [ "dask/tests/test_distributed.py" ];
sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al";
})
];
propagatedBuildInputs = [
cloudpickle
fsspec

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

@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "distributed";
version = "2021.9.1";
version = "2021.10.0";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9N65ap2+9bBK0DCrkF3+1xuJPXmjaL1Xh7ISaLTtX/g=";
sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za";
};
propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "django-environ";
version = "0.7.0";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "b99bd3704221f8b717c8517d8146e53fdee509d9e99056be560060003b92213e";
sha256 = "6f0bc902b43891656b20486938cba0861dc62892784a44919170719572a534cb";
};
# The testsuite fails to modify the base environment

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

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "easy-thumbnails";
version = "2.7.1";
version = "2.7.2";
meta = {
description = "Easy thumbnails for Django";
@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "f862949208d9066cd3d84ffcf9c2dbe9c7344ea6152b741e440f861eca46855c";
sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a";
};
propagatedBuildInputs = [ django pillow ];

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

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.5.2";
version = "4.6.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
sha256 = "1zz4p13ww9y5x0ifvcj652hgfbjqbnmr3snwrs0p315sc3y47ggm";
sha256 = "1lx5q3m3vhbx9xnm3v25xrrxvli1nh0lsza51ln4y3fk79ln91hv";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/huawei-lte-api/default.nix
View File

@ -2,15 +2,15 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, dicttoxml
, pycryptodomex
, pytestCheckHook
, requests
, xmltodict
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "huawei-lte-api";
version = "1.4.18";
version = "1.5.2";
disabled = pythonOlder "3.4";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Salamek";
repo = "huawei-lte-api";
rev = version;
sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg";
sha256 = "sha256-xG0QTvjYW0/C/7NNhl/d024TSAe0TzgMknOXvNxrPOY=";
};
postPatch = ''
@ -27,7 +27,7 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
dicttoxml
pycryptodomex
requests
xmltodict
];

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

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
version = "4.0.8";
version = "4.0.9";
pname = "icalendar";
src = fetchPypi {
inherit pname version;
sha256 = "7508a92b4e36049777640b0ae393e7219a16488d852841a0e57b44fe51d9f848";
sha256 = "cc73fa9c848744843046228cb66ea86cd8c18d73a51b140f7c003f760b84a997";
};
buildInputs = [ setuptools ];

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "jaeger-client";
version = "4.6.1";
version = "4.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3";
sha256 = "3157836edab8e2c209bd2d6ae61113db36f7ee399e66b1dcbb715d87ab49bfe0";
};
propagatedBuildInputs = [

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "jellyfish";
version = "0.8.8";
version = "0.8.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c";
sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2";
};
checkInputs = [ pytest unicodecsv ];

37
pkgs/development/python-modules/manimpango/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }:
buildPythonPackage rec {
pname = "manimpango";
version = "0.3.1";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = pname;
rev = "v${version}";
sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ=";
};
postPatch = ''
substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" ""
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
propagatedBuildInputs = [
cython
];
preBuild = ''
${python.interpreter} setup.py build_ext --inplace
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "manimpango" ];
meta = with lib; {
homepage = "https://github.com/ManimCommunity/ManimPango";
license = licenses.gpl3Plus;
description = "Binding for Pango";
maintainers = [ maintainers.angustrau ];
};
}

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

@ -1,4 +1,10 @@
{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }:
{ lib
, buildPythonPackage
, fetchPypi
, future
, numpy
, pytest
}:
buildPythonPackage rec {
pname = "MDP";
@ -9,11 +15,27 @@ buildPythonPackage rec {
sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ future numpy ];
# Tests disabled because of missing dependencies not in nix
doCheck = false;
checkInputs = [ pytest ];
doCheck = true;
pythonImportsCheck = [ "mdp" "bimdp" ];
postPatch = ''
# https://github.com/mdp-toolkit/mdp-toolkit/issues/92
substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict
'';
checkPhase = ''
runHook preCheck
pytest --seed 7710873 mdp
pytest --seed 7710873 bimdp
runHook postCheck
'';
meta = with lib; {
description = "Library for building complex data processing software by combining widely used machine learning algorithms";

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

@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "nbdime";
version = "3.1.0";
version = "3.1.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963";
sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b";
};
checkInputs = [

34
pkgs/development/python-modules/panacotta/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "panacotta";
version = "0.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "u1f35c";
repo = "python-panacotta";
rev = "panacotta-${version}";
sha256 = "0v2fa18n50iy18n22klkgjral728iplj6yk3b6hjkzas5dk9wd9c";
};
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"panacotta"
];
meta = with lib; {
description = "Python API for controlling Panasonic Blu-Ray players";
homepage = "https://github.com/u1f35c/python-panacotta";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};
}

32
pkgs/development/python-modules/pyaftership/default.nix
View File

@ -1,9 +1,8 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pythonOlder
, aiohttp
, async-timeout
, aresponses
, pytest-asyncio
, pytestCheckHook
@ -11,21 +10,38 @@
buildPythonPackage rec {
pname = "pyaftership";
version = "21.1.0";
version = "21.11.0";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5";
sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q=";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [ pytestCheckHook aresponses pytest-asyncio ];
pythonImportsCheck = [ "pyaftership" ];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
postPatch = ''
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
# are not in their focus
substituteInPlace setup.py \
--replace 'version="main",' 'version="${version}",'
'';
pythonImportsCheck = [
"pyaftership"
];
meta = with lib; {
description = "Python wrapper package for the AfterShip API";

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

@ -21,7 +21,7 @@ let
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
version = "2021.2.8";
version = "2021.2.9";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
@ -30,7 +30,7 @@ in buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76";
sha256 = "51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e";
};
# py.test is not needed during runtime, so remove it from `install_requires`

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

@ -7,12 +7,12 @@ buildPythonPackage rec {
# upstream has abandoned project in favor of pytest-flake8
# retaining package to not break other packages
pname = "pytest-flakes";
version = "4.0.3";
version = "4.0.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
sha256 = "551467a129331bed83596f3145d9eaf6541c26a03dc1b36419efef8ae231341b";
};
buildInputs = [ pytest ];

51
pkgs/development/python-modules/pytraccar/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "pytraccar";
version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "08f7rwvbc1h17lvgv9823ssd3p0vw7yzsg40lbkacgqqiv1hxfzs";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
pytestCheckHook
pytest-asyncio
];
postPatch = ''
# Upstream doesn't set version in the repo
substituteInPlace setup.py \
--replace 'version="master",' 'version="${version}",'
'';
pythonImportsCheck = [
"pytraccar"
];
meta = with lib; {
description = "Python library to handle device information from Traccar";
homepage = "https://github.com/ludeeus/pytraccar";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

51
pkgs/development/python-modules/pyuptimerobot/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyuptimerobot";
version = "21.11.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "1nmmwp9m38b75lz51ypcj0qxnxm9wq4id5cggl0pn2rx6gwnbw9n";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
pytestCheckHook
pytest-asyncio
];
postPatch = ''
# Upstream doesn't set version in the repo
substituteInPlace setup.py \
--replace 'version="main",' 'version="${version}",'
'';
pythonImportsCheck = [
"pyuptimerobot"
];
meta = with lib; {
description = "Python API wrapper for Uptime Robot";
homepage = "https://github.com/ludeeus/pyuptimerobot";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.63.0";
version = "2.63.1";
src = fetchPypi {
inherit pname version;
sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8";
sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748";
};
pythonImportsCheck = [

0
pkgs/development/python-modules/simple_di/default.nix → pkgs/development/python-modules/simple-di/default.nix
View File

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "staticjinja";
version = "4.1.0";
version = "4.1.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU=";
sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM=";
};
nativeBuildInputs = [

36
pkgs/development/python-modules/streamz/default.nix
View File

@ -14,6 +14,7 @@
, toolz
, tornado
, zict
, fetchpatch
}:
buildPythonPackage rec {
@ -28,6 +29,16 @@ buildPythonPackage rec {
sha256 = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8=";
};
patches = [
# remove with next bump
(fetchpatch {
name = "fix-tests-against-distributed-2021.10.0.patch";
url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch";
sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7";
includes = ["streamz/tests/test_dask.py"];
})
];
propagatedBuildInputs = [
networkx
six
@ -46,22 +57,23 @@ buildPythonPackage rec {
requests
];
disabledTests = [
# Disable test_tcp_async because fails on sandbox build
"test_partition_timeout"
"test_tcp_async"
"test_tcp"
];
disabledTestPaths = [
# Disable kafka tests
"streamz/tests/test_kafka.py"
];
pythonImportsCheck = [
"streamz"
];
disabledTests = [
# test_tcp_async fails on sandbox build
"test_tcp_async"
"test_tcp"
"test_partition_timeout"
# flaky
"test_from_iterable_backpressure"
];
disabledTestPaths = [
# disable kafka tests
"streamz/tests/test_kafka.py"
];
meta = with lib; {
description = "Pipelines to manage continuous streams of data";
homepage = "https://github.com/python-streamz/streamz";

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

@ -17,7 +17,7 @@ buildPythonPackage rec {
requests flask flask-cors dbus-python
];
preConfigure = ''
postPatch = ''
substituteInPlace setup.py \
--replace 'flask==2.0.1' 'flask'
'';

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "tweepy";
version = "3.10.0";
version = "4.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a";
sha256 = "3bbb14a0ddef1ca8c9e8686ab2f647163afa02a6bab83507335ce647e9653a90";
};
doCheck = false;

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "vispy";
version = "0.9.1";
version = "0.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "75e2923792b937fbb0eb817716430613b6a2b37331cffb13bf623913a76b1da1";
sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a";
};
patches = [

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "xarray";
version = "0.19.0";
version = "0.20.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b";
sha256 = "9c0bffd8b55fdef277f8f6c817153eb51fa4e58653a7ad92eaed9984164b7bdb";
};
nativeBuildInputs = [ setuptools-scm ];

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

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "zarr";
version = "2.10.1";
version = "2.10.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "29e90114f037d433752b3cf951e4a3cb6c6f67b6501a273439b4be4a824e4caf";
sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2";
};
nativeBuildInputs = [

21
pkgs/development/tools/fortran-language-server/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib, fetchPypi, buildPythonApplication }:
buildPythonApplication rec {
pname = "fortran-language-server";
version = "1.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
};
checkPhase = "$out/bin/fortls --help 1>/dev/null";
pythonImportsCheck = [ "fortls" ];
meta = with lib; {
description = "FORTRAN Language Server for the Language Server Protocol";
homepage = "https://pypi.org/project/fortran-language-server/";
license = [ licenses.mit ];
maintainers = [ maintainers.sheepforce ];
};
}

41
pkgs/games/openmw/default.nix
View File

@ -13,29 +13,46 @@
, unshield
, openal
, libXt
, lz4
, recastnavigation
}:
let
openscenegraph_ = openscenegraph.overrideDerivation (self: {
openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; })
.overrideDerivation (self: {
src = fetchFromGitHub {
owner = "OpenMW";
repo = "osg";
# commit does not exist on any branch on the target repository
rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf";
sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd";
rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6";
sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo=";
};
});
bullet_openmw = bullet.overrideDerivation (old: rec {
version = "3.17";
src = fetchFromGitHub {
owner = "bulletphysics";
repo = "bullet3";
rev = version;
sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q=";
};
patches = [];
cmakeFlags = (old.cmakeFlags or []) ++ [
"-DUSE_DOUBLE_PRECISION=ON"
"-DBULLET2_MULTITHREADING=ON"
];
});
in
mkDerivation rec {
version = "0.46.0";
pname = "openmw";
version = "0.47.0";
src = fetchFromGitHub {
owner = "OpenMW";
repo = "openmw";
rev = "${pname}-${version}";
sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x";
sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
@ -43,26 +60,28 @@ mkDerivation rec {
buildInputs = [
SDL2
boost
bullet
bullet_openmw
ffmpeg
libXt
mygui
openal
openscenegraph_
openscenegraph_openmw
unshield
lz4
recastnavigation
];
cmakeFlags = [
"-DDESIRED_QT_VERSION:INT=5"
# as of 0.46, openmw is broken with GLVND
"-DOpenGL_GL_PREFERENCE=LEGACY"
"-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"
];
meta = with lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
homepage = "http://openmw.org";
homepage = "https://openmw.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar ];
maintainers = with maintainers; [ abbradar marius851000 ];
platforms = platforms.linux;
};
}

9
pkgs/games/openmw/tes3mp.nix
View File

@ -9,6 +9,7 @@
, symlinkJoin
, mygui
, crudini
, bullet
}:
# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy
@ -70,7 +71,8 @@ let
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];
buildInputs = oldAttrs.buildInputs ++ [ luajit ];
buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs)
++ [ luajit ];
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DBUILD_OPENCS=OFF"
@ -79,6 +81,11 @@ let
"-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a"
];
prePatch = ''
substituteInPlace components/process/processinvoker.cpp \
--replace "\"./\"" "\"$out/bin/\""
'';
# https://github.com/TES3MP/openmw-tes3mp/issues/552
patches = [ ./tes3mp.patch ];

22
pkgs/games/portmod/default.nix
View File

@ -1,22 +1,22 @@
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }:
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert
, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip
, jre, makeWrapper, tr-patcher, tes3cmd, openmw }:
let
version = "2.0.3";
version = "2.1.0";
src = fetchFromGitLab {
owner = "portmod";
repo = "Portmod";
rev = "v${version}";
sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128=";
sha256 = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE=";
};
portmod-rust = rustPlatform.buildRustPackage rec {
inherit src version;
pname = "portmod-rust";
cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0=";
cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE=";
nativeBuildInputs = [ python3Packages.python ];
@ -30,6 +30,7 @@ let
tr-patcher
tes3cmd
imagemagick
openmw
];
in
@ -47,15 +48,6 @@ python3Packages.buildPythonApplication rec {
--replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" ""
'';
patches = [
(fetchpatch {
# fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393)
# happen with ~/.nix-profile
url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch";
sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA=";
})
];
propagatedBuildInputs = with python3Packages; [
setuptools-scm
setuptools

9
pkgs/games/quake2/yquake2/default.nix
View File

@ -15,15 +15,20 @@ let
yquake2 = stdenv.mkDerivation rec {
pname = "yquake2";
version = "7.43";
version = "8.00";
src = fetchFromGitHub {
owner = "yquake2";
repo = "yquake2";
rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp";
sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w";
};
postPatch = ''
substituteInPlace src/common/filesystem.c \
--replace /usr/share/games/quake2 $out/share/games/quake2
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 libGL curl ]

474
pkgs/misc/vim-plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/misc/vim-plugins/overrides.nix
View File

@ -776,6 +776,10 @@ self: super: {
];
});
vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs (old: {
dependencies = with self; [ fzf-vim ];
});
# change the go_bin_path to point to a path in the nix store. See the code in
# fatih/vim-go here
# https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159

2
pkgs/misc/vim-plugins/update-shell.nix
View File

@ -7,7 +7,7 @@ mkShell {
packages = [
bash
pyEnv
nix
nix_2_3
nix-prefetch-scripts
];
}

8
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -228,7 +228,9 @@ honza/vim-snippets
hotwatermorning/auto-git-diff
hrsh7th/cmp-buffer@main
hrsh7th/cmp-calc@main
hrsh7th/cmp-cmdline@main
hrsh7th/cmp-emoji@main
hrsh7th/cmp-nvim-lsp-document-symbol@main
hrsh7th/cmp-nvim-lsp@main
hrsh7th/cmp-nvim-lua@main
hrsh7th/cmp-omni@main
@ -381,7 +383,7 @@ ledger/vim-ledger
lepture/vim-jinja
lervag/vimtex
lewis6991/gitsigns.nvim@main
lf-lang/lingua-franca.vim
lf-lang/lingua-franca.vim@main
lfe-support/vim-lfe
lfilho/cosco.vim
lifepillar/vim-gruvbox8
@ -439,6 +441,7 @@ mattn/webapi-vim
matze/vim-move
max397574/better-escape.nvim
maximbaz/lightline-ale
maxjacobson/vim-fzf-coauthorship
MaxMEllon/vim-jsx-pretty
mbbill/undotree
mboughaba/i3config.vim
@ -648,6 +651,7 @@ romainl/vim-qlist
roman/golden-ratio
romgrk/barbar.nvim
romgrk/nvim-treesitter-context
ron-rs/ron.vim
ron89/thesaurus_query.vim
roxma/nvim-cm-racer
roxma/nvim-completion-manager
@ -884,8 +888,8 @@ vmchale/ats-vim
vmchale/dhall-vim
vn-ki/coc-clap
voldikss/vim-floaterm
VundleVim/Vundle.vim
vuki656/package-info.nvim
VundleVim/Vundle.vim
w0ng/vim-hybrid
wakatime/vim-wakatime
wannesm/wmgraphviz.vim

4
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.14.14";
version = "5.14.16";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "sha256-gwWZNGHmbKQajMP4mu3XT2Xf93MkcNpAXW8h94O4pNM=";
sha256 = "sha256-nWeHvKnVo/ln8sTLdFTK1pG09HMTdZ75a+3Ehxjd5pc=";
};
extraMeta = {

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

@ -631,7 +631,7 @@
"owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ];
"ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
"p1_monitor" = ps: with ps; [ p1monitor ];
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_bluray" = ps: with ps; [ panacotta ];
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect ];
"panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
@ -890,7 +890,7 @@
"touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
"tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ];
"tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
"traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar
"traccar" = ps: with ps; [ aiohttp-cors pytraccar stringcase ];
"trace" = ps: with ps; [ ];
"tractive" = ps: with ps; [ aiotractive ];
"tradfri" = ps: with ps; [ pytradfri ];
@ -922,7 +922,7 @@
"updater" = ps: with ps; [ ];
"upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
"uptime" = ps: with ps; [ ];
"uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
"uptimerobot" = ps: with ps; [ pyuptimerobot ];
"usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ];
"uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
"usgs_earthquakes_feed" = ps: with ps; [ geojson-client ];

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

@ -662,6 +662,7 @@ in with py.pkgs; buildPythonApplication rec {
"toon"
"totalconnect"
"tplink"
"traccar"
"trace"
"tradfri"
"transmission"
@ -683,6 +684,7 @@ in with py.pkgs; buildPythonApplication rec {
# disabled, because it tries to join a multicast group and fails to find a usable network interface
# "upnp"
"uptime"
"uptimerobot"
"usgs_earthquakes_feed"
"utility_meter"
"uvc"

21
pkgs/servers/openafs/1.8/module.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
, kernel, glibc, perl, libtool_2, libkrb5 }:
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
with (import ./srcs.nix {
inherit fetchurl;
@ -18,6 +18,23 @@ in stdenv.mkDerivation {
buildInputs = [ libkrb5 ];
patches = [
# LINUX 5.14: explicitly set set_page_dirty to default
((fetchpatch {
url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";
sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";
}).overrideAttrs (o: {
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
}))
# Linux 5.15: Convert osi_Msg macro to a function
((fetchpatch {
url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";
sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";
}).overrideAttrs (o: {
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
}))
];
hardeningDisable = [ "pic" ];
configureFlags = [
@ -56,6 +73,6 @@ in stdenv.mkDerivation {
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = with maintainers; [ maggesi spacefrogg ];
broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened;
broken = versionOlder kernel.version "3.18" || kernel.isHardened;
};
}

8
pkgs/tools/admin/realvnc-vnc-viewer/default.nix
View File

@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "realvnc-vnc-viewer";
version = "6.21.406";
version = "6.21.920";
src = {
"x86_64-linux" = fetchurl {
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
sha256 = "0rnizzanaykqg1vfy56p8abc4fmgpbibj54j4c1v81zsj3kmahka";
sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz";
};
"i686-linux" = fetchurl {
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
sha256 = "1rlxfiqymi1licn2spyiqa00kiwzhdr0pkh7vv3ai6gb9f6phk31";
sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn";
};
}.${stdenv.system};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ autoPatchelfHook rpmextract ];
buildInputs = [ libX11 libXext ];

20
pkgs/tools/compression/ouch/default.nix
View File

@ -1,4 +1,14 @@
{ lib, rustPlatform, fetchFromGitHub, help2man, installShellFiles }:
{ lib
, rustPlatform
, fetchFromGitHub
, help2man
, installShellFiles
, pkg-config
, bzip2
, xz
, zlib
, zstd
}:
rustPlatform.buildRustPackage rec {
pname = "ouch";
@ -13,7 +23,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-jEprWtIl5LihD9fOMYHGGlk0+h4woUlwUWNfSkd2t10=";
nativeBuildInputs = [ help2man installShellFiles ];
nativeBuildInputs = [ help2man installShellFiles pkg-config ];
buildInputs = [ bzip2 xz zlib zstd ];
cargoBuildFlags = [ "--features" "zstd/pkg-config" ];
cargoTestFlags = cargoBuildFlags;
postInstall = ''
help2man $out/bin/ouch > ouch.1

12
pkgs/tools/inputmethods/emote/default.nix
View File

@ -2,18 +2,21 @@
python3Packages.buildPythonApplication rec {
pname = "emote";
version = "2.0.0";
version = "3.0.3";
src = fetchFromGitHub {
owner = "tom-james-watson";
repo = "Emote";
rev = "v${version}";
sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ=";
sha256 = "mqCSl+EGbnL9AfzZT3aa/Y5Rsx433ZmI31BmK3wkaJk=";
};
postPatch = ''
substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject"
substituteInPlace setup.py \
--replace "pygobject==3.36.0" "pygobject" \
--replace "manimpango==0.3.0" "manimpango"
substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'"
substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'"
substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg"
'';
@ -27,6 +30,7 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = [
python3Packages.manimpango
python3Packages.pygobject3
gtk3
xdotool
@ -36,7 +40,7 @@ python3Packages.buildPythonApplication rec {
postInstall = ''
install -D snap/gui/emote.desktop $out/share/applications/emote.desktop
install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg
install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css}
install -D -t $out/share/emote/static static/{NotoColorEmoji.ttf,emojis.csv,logo.svg,style.css}
'';
dontWrapGApps = true;

7
pkgs/tools/misc/most/default.nix
View File

@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v";
};
patches = [
# Upstream patch to fix parallel build failure
./parallel-make.patch
];
outputs = [ "out" "doc" ];
makeFlags = [
@ -26,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [ slang ncurses ];
enableParallelBuilding = true;
meta = with lib; {
description = "A terminal pager similar to 'more' and 'less'";
longDescription = ''

18
pkgs/tools/misc/most/parallel-make.patch Normal file
View File

@ -0,0 +1,18 @@
Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
when performing a parallel build")
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
all: $(EXEC)
$(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
@echo $(EXEC) created in $(OBJDIR)
+
+# C source files include autogenrated "config.h". Make sure
+# it's available before the compilation. Pessimistically assume
+# any source file can depend on "config.h".
+$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
+
$(OBJDIR)/$(EXEC): $(OBJS)
cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
#

16
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonPackage
{ lib, fetchurl, fetchpatch, buildPythonPackage
, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
# Pandoc is required to build the package's man page. Release tarballs contain a
# formatted man page already, though, it will still be installed. We keep the
@ -25,6 +25,20 @@ buildPythonPackage rec {
sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw";
};
patches = [
# Fixes throttling on youtube.com. Without the patch downloads are capped at
# about 80KiB/s. See, e.g.,
#
# https://github.com/ytdl-org/youtube-dl/issues/29326
#
# The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30188
(fetchpatch {
name = "fix-youtube-dl-speed.patch";
url = "https://github.com/ytdl-org/youtube-dl/pull/30188.patch";
sha256 = "15liban37ina2y4bnykfdywdy4rbkfff2r6vd0kqn2k7rfkcczyz";
})
];
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;

11
pkgs/tools/networking/nss-mdns/default.nix
View File

@ -21,14 +21,13 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
];
patches = lib.optional stdenv.hostPlatform.isMusl
(
fetchpatch
{
patches = [
# Provide compat definition for libc lacking <nss.h> (e.g. musl)
(fetchpatch {
url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch";
sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds";
}
);
})
];
meta = {

28
pkgs/tools/networking/tinyssh/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "tinyssh";
version = "20210601";
src = fetchFromGitHub {
owner = "janmojzis";
repo = "tinyssh";
rev = version;
sha256 = "sha256-+THoPiD6dW5ZuiQmmLckOJGyjhzdF3qF0DgC51zjGY8=";
};
preConfigure = ''
echo /bin > conf-bin
echo /share/man > conf-man
'';
DESTDIR = placeholder "out";
meta = with lib; {
description = "minimalistic SSH server";
homepage = "https://tinyssh.org";
license = licenses.publicDomain;
platforms = platforms.unix;
maintainers = [ maintainers.kaction ];
};
}

52
pkgs/tools/security/hash-slinger/default.nix
View File

@ -1,45 +1,63 @@
{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }:
{ lib
, stdenv
, fetchFromGitHub
, python3
, unbound
, libreswan
}:
let
pythonPackages = python2Packages;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "hash-slinger";
version = "2.7";
version = "3.1";
src = fetchFromGitHub {
owner = "letoams";
repo = pname;
rev = version;
sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn";
sha256 = "sha256-mhMUdZt846QjwRIh2m/4EE+93fUcCKc2FFeoFpzKYvk=";
};
pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg
pyunbound ];
pythonPath = with python3.pkgs; [
dnspython
m2crypto
python-gnupg
pyunbound
];
buildInputs = [ pythonPackages.wrapPython ];
propagatedBuildInputs = [ unbound libreswan ] ++ pythonPath;
propagatedUserEnvPkgs = [ unbound libreswan ];
buildInputs = [
python3.pkgs.wrapPython
];
patchPhase = ''
propagatedBuildInputs = [
unbound
libreswan
] ++ pythonPath;
propagatedUserEnvPkgs = [
unbound
libreswan
];
postPatch = ''
substituteInPlace Makefile \
--replace "$(DESTDIR)/usr" "$out"
substituteInPlace ipseckey \
--replace "/usr/sbin/ipsec" "${libreswan}/sbin/ipsec"
substituteInPlace tlsa \
--replace "/var/lib/unbound/root" "${pythonPackages.pyunbound}/etc/pyunbound/root"
--replace "/var/lib/unbound/root" "${python3.pkgs.pyunbound}/etc/pyunbound/root"
patchShebangs *
'';
installPhase = ''
mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/
mkdir -p $out/bin $out/man $out/lib/${python3.libPrefix}/site-packages
make install
wrapPythonPrograms
'';
meta = {
meta = with lib; {
description = "Various tools to generate special DNS records";
homepage = "https://github.com/letoams/hash-slinger";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.leenaars ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ leenaars ];
};
}

3
pkgs/tools/security/mkpasswd/default.nix
View File

@ -2,8 +2,7 @@
stdenv.mkDerivation {
pname = "mkpasswd";
inherit (whois) version;
inherit (whois) src;
inherit (whois) version src;
nativeBuildInputs = [ perl pkg-config ];
buildInputs = [ libxcrypt ];

1
pkgs/tools/security/rbw/default.nix
View File

@ -74,7 +74,6 @@ rustPlatform.buildRustPackage rec {
$out/bin/rbw gen-completions $shell > rbw.$shell
installShellCompletion rbw.$shell
done
'' + ''
cp bin/git-credential-rbw $out/bin
'' + lib.optionalString withFzf ''
cp bin/rbw-fzf $out/bin

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

@ -862,6 +862,8 @@ with pkgs;
aescrypt = callPackage ../tools/misc/aescrypt { };
aether-lv2 = callPackage ../applications/audio/aether-lv2 { };
acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };
adriconf = callPackage ../tools/graphics/adriconf { };
@ -1459,7 +1461,9 @@ with pkgs;
bic = callPackage ../development/interpreters/bic { };
binance = callPackage ../applications/misc/binance { };
binance = callPackage ../applications/misc/binance {
electron = electron_12;
};
bit = callPackage ../applications/version-management/git-and-tools/bit { };
@ -8177,6 +8181,8 @@ with pkgs;
opensm = callPackage ../tools/networking/opensm { };
tinyssh = callPackage ../tools/networking/tinyssh { };
opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});
openssh = opensshPackages.openssh.override {
@ -14448,6 +14454,8 @@ with pkgs;
fprettify = callPackage ../development/tools/fprettify { };
fortran-language-server = python3.pkgs.callPackage ../development/tools/fortran-language-server { };
framac = callPackage ../development/tools/analysis/frama-c { };
frame = callPackage ../development/libraries/frame { };
@ -15824,6 +15832,8 @@ with pkgs;
cointop = callPackage ../applications/misc/cointop { };
collada-dom = callPackage ../development/libraries/collada-dom { };
cog = callPackage ../development/web/cog { };
cosmopolitan = callPackage ../development/libraries/cosmopolitan { };
@ -19221,6 +19231,8 @@ with pkgs;
readosm = callPackage ../development/libraries/readosm { };
recastnavigation = callPackage ../development/libraries/recastnavigation { };
rinutils = callPackage ../development/libraries/rinutils { };
kissfft = callPackage ../development/libraries/kissfft { };
@ -28165,6 +28177,8 @@ with pkgs;
git = gitMinimal;
};
surge-XT = callPackage ../applications/audio/surge-XT { };
survex = callPackage ../applications/misc/survex {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};

3
pkgs/top-level/metrics.nix
View File

@ -8,7 +8,8 @@ runCommand "nixpkgs-metrics"
#requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time
}
''
export NIX_STATE_DIR=$TMPDIR
export NIX_STORE_DIR=$TMPDIR/store
export NIX_STATE_DIR=$TMPDIR/state
export NIX_PAGER=
nix-store --init

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

@ -4581,6 +4581,10 @@ in {
manhole = callPackage ../development/python-modules/manhole { };
manimpango = callPackage ../development/python-modules/manimpango {
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
};
manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { };
manuel = callPackage ../development/python-modules/manuel { };
@ -5422,6 +5426,8 @@ in {
pamqp = callPackage ../development/python-modules/pamqp { };
panacotta = callPackage ../development/python-modules/panacotta { };
pandas = callPackage ../development/python-modules/pandas { };
pandas-datareader = callPackage ../development/python-modules/pandas-datareader { };
@ -7720,6 +7726,8 @@ in {
cudaSupport = false;
};
pytraccar = callPackage ../development/python-modules/pytraccar { };
pytradfri = callPackage ../development/python-modules/pytradfri { };
pytrafikverket = callPackage ../development/python-modules/pytrafikverket { };
@ -7769,6 +7777,8 @@ in {
pyupgrade = callPackage ../development/python-modules/pyupgrade { };
pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { };
pyusb = callPackage ../development/python-modules/pyusb {
inherit (pkgs) libusb1;
};
@ -8531,7 +8541,7 @@ in {
simplekml = callPackage ../development/python-modules/simplekml { };
simple-di = callPackage ../development/python-modules/simple_di { };
simple-di = callPackage ../development/python-modules/simple-di { };
simple-rest-client = callPackage ../development/python-modules/simple-rest-client { };