b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-05-24 06:01:54 +00:00 committed by GitHub
parent 574f2d4696 8a74895616
commit 2e043cf685
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 858 additions and 1368 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/systems/default.nix
View file

@ -171,7 +171,7 @@ rec {
wine = (pkgs.winePackagesFor wine-name).minimal;
in
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
pkgs.stdenv.hostPlatform.isCompatible final
pkgs.stdenv.hostPlatform.canExecute final
then "${pkgs.runtimeShell} -c '\"$@\"' --"
else if final.isWindows
then "${wine}/bin/${wine-name}"

32
pkgs/applications/misc/archivy/default.nix
View file

@ -1,52 +1,34 @@
{ lib
, stdenv
, python3
, fetchPypi
}:
let
defaultOverrides = [
(self: super: {
py = python3.override {
packageOverrides = self: super: {
wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec {
version = "2.3.1";
pname = "WTForms";
src = super.fetchPypi {
inherit pname version;
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI=";
};
doCheck = false;
});
})
];
mkOverride = attrname: version: sha256:
self: super: {
${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
inherit version;
src = oldAttrs.src.override {
inherit version sha256;
};
});
};
py = python3.override {
# Put packageOverrides at the start so they are applied after defaultOverrides
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
};
in
with py.pkgs;
buildPythonApplication rec {
pname = "archivy";
version = "1.7.2";
version = "1.7.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-o5dVJDbdKgo6hMMU9mKzoouSgVWl7xSAp+Aq61VcfeU=";
hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns";
};
nativeBuildInputs = [ pythonRelaxDepsHook ];
@ -61,7 +43,7 @@ buildPythonApplication rec {
elasticsearch
flask-compress
flask_login
flask_wtf
flask-wtf
html2text
python-dotenv
python-frontmatter

2
pkgs/applications/misc/buku/default.nix
View file

@ -28,7 +28,7 @@ let
flask-bootstrap
flask-paginate
flask-reverse-proxy-fix
flask_wtf
flask-wtf
arrow
werkzeug
click

24
pkgs/applications/misc/etesync-dav/default.nix
View file

@ -7,12 +7,32 @@
let
python = python3.override {
packageOverrides = self: super: {
flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec {
flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
version = "0.15.1";
src = old.src.override {
inherit version;
sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
};
disabledTests = [
"test_outside_request"
];
});
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
version = "2.0.3";
src = old.src.override {
inherit version;
sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c";
};
});
wtforms = super.wtforms.overridePythonAttrs (old: rec {
version = "2.3.3";
src = old.src.override {
inherit version;
sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c";
};
checkPhase = ''
${self.python.interpreter} tests/runtests.py
'';
});
};
};
@ -29,7 +49,7 @@ in python.pkgs.buildPythonApplication rec {
etebase
etesync
flask
flask_wtf
flask-wtf
(python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
];

23
pkgs/applications/misc/waybar/default.nix
View file

@ -25,18 +25,19 @@
, swaySupport ? true, sway
, mpdSupport ? true, libmpdclient
, rfkillSupport ? true
, upowerSupport ? true, upower
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
}:
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.12";
version = "0.9.13";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8=";
sha256 = "sha256-Uzg2IrCDD8uUdGAveA8IjvonJnnnobOrAgjGG1kQ3pU=";
};
nativeBuildInputs = [
@ -52,14 +53,15 @@ stdenv.mkDerivation rec {
buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional sndioSupport sndio
++ optional nlSupport libnl
++ optional udevSupport udev
++ optional evdevSupport libevdev
++ optional swaySupport sway
++ optional mpdSupport libmpdclient;
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional sndioSupport sndio
++ optional nlSupport libnl
++ optional udevSupport udev
++ optional evdevSupport libevdev
++ optional swaySupport sway
++ optional mpdSupport libmpdclient
++ optional upowerSupport upower;
checkInputs = [ catch2 ];
doCheck = runTests;
@ -74,6 +76,7 @@ stdenv.mkDerivation rec {
libudev = udevSupport;
mpd = mpdSupport;
rfkill = rfkillSupport;
upower_glib = upowerSupport;
tests = runTests;
}
) ++ [

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

@ -192,9 +192,9 @@ rec {
};
terraform_1 = mkTerraform {
version = "1.2.0";
sha256 = "sha256-5um+zS7MVL59SlxchjXdlhBGNdacbQgvg7BRAWnW5XU=";
vendorSha256 = "sha256-6x1cv+DKXH2yyMjIA6JY5EkTmWbwH4LBammXKtw2EZo=";
version = "1.2.1";
sha256 = "sha256-zvpKL7SsUeDu7pHSJTYbbJcn7kDcGk5M2jBMkkBLMtE=";
vendorSha256 = "sha256-2w0XAoja3DwztI3WxvLCUqrjW1PzSR6BU0T8TtM3TAw=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};

4
pkgs/applications/virtualization/conmon/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-75Xyp25+JJtrXJO+cRFPkDj64zgdlVTAygGwFuJ7jKA=";
sha256 = "sha256-HzLRwJwzvXhQOcmBp55I54sAnCKPeQw99H/XMOegOHo=";
};
nativeBuildInputs = [ pkg-config ];

20
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
View file

@ -1,14 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
, ninja
, python3
, vala
, desktop-file-utils
, gtk3
, libxml2
, libhandy
@ -16,36 +14,25 @@
, folks
, libgdata
, sqlite
, glib-networking
, granite
, evolution-data-server
, appstream
, wrapGAppsHook
, libgee
}:
stdenv.mkDerivation rec {
pname = "elementary-mail";
version = "6.4.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "mail";
rev = version;
sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
};
patches = [
# Fix build with vala 0.56
# https://github.com/elementary/mail/pull/765
(fetchpatch {
url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch";
sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig=";
})
];
nativeBuildInputs = [
appstream
desktop-file-utils
libxml2
meson
ninja
@ -58,6 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [
evolution-data-server
folks
glib-networking
granite
gtk3
libgdata

46
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View file

@ -3,73 +3,51 @@
, fetchFromGitHub
, fetchpatch
, nix-update-script
, desktop-file-utils
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook
, wrapGAppsHook4
, glib
, granite
, granite7
, gst_all_1
, gtk3
, libgda
, libgee
, libgpod
, libhandy
, libpeas
, taglib
, zeitgeist
, gtk4
}:
stdenv.mkDerivation rec {
pname = "elementary-music";
version = "5.1.1";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "music";
rev = version;
sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n";
sha256 = "sha256-fZbOjZd6udJWM+jWXCmGwt6cyl/lXPsgM9XeTScbqts=";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/music/pull/648
# Use file basename for fallback audio object title
# https://github.com/elementary/music/pull/710
(fetchpatch {
url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch";
sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx";
})
# Fix build with meson 0.61
# https://github.com/elementary/music/pull/674
(fetchpatch {
url = "https://github.com/elementary/music/commit/fb3d840049c1e2e0bf8fdddea378a2db647dd096.patch";
sha256 = "sha256-tQZv7hZExLqbkGXahZxDfg7bkgwCKYbDholC2zuwlNw=";
url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch";
sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w=";
})
];
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [
glib
granite
gtk3
libgda
libgee
libgpod
libhandy
libpeas
taglib
zeitgeist
granite7
gtk4
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base

4
pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix vendored
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "pantheon-tweaks";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "pantheon-tweaks";
repo = pname;
rev = version;
sha256 = "sha256-Pn/MIJ/WS/TY5bemM77B37E0KFRlDUfrOl1XS2yJlGk=";
sha256 = "sha256-L/3PrkfWOGYtqeH/DajGEGCsF5yYnWuESxUTfROSHQ4=";
};
patches = [

12
pkgs/development/compilers/flasm/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
{ lib, stdenv, fetchzip, unzip, fetchpatch, bison, flex, gperf, zlib }:
stdenv.mkDerivation rec {
pname = "flasm";
@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
stripRoot = false;
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchains:
# https://sourceforge.net/p/flasm/patches/2/
(fetchpatch {
name = "fno-common.patch";
url = "https://sourceforge.net/p/flasm/patches/2/attachment/0001-flasm-fix-build-on-gcc-10-fno-common.patch";
sha256 = "0ic7k1mmyvhpnxam89dbg8i9bfzk70zslfdxgpmkszx097bj1hv6";
})
];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
nativeBuildInputs = [ unzip bison flex gperf ];

11
pkgs/development/interpreters/rakudo/moarvm.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, perl
, CoreServices
, ApplicationServices
@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8=";
};
patches = [
(fetchpatch {
name = "mimalloc-older-macos-fixes.patch";
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
stripLen = 1;
extraPrefix = "3rdparty/mimalloc/";
sha256 = "1gcbn1850vy7xzalhn9ffnsg6x1ywi3fmnxvnal3m6lmb4kz5kb1";
})
];
postPatch = ''
patchShebangs .
'' + lib.optionalString stdenv.isDarwin ''

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

@ -17,7 +17,7 @@
, dill
, flask
, flask_login
, flask_wtf
, flask-wtf
, flask-appbuilder
, flask-caching
, GitPython
@ -126,7 +126,7 @@ buildPythonPackage rec {
flask-appbuilder
flask-caching
flask_login
flask_wtf
flask-wtf
GitPython
graphviz
gunicorn

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

@ -11,7 +11,7 @@
, flask_login
, flask-openid
, flask_sqlalchemy
, flask_wtf
, flask-wtf
, flask-jwt-extended
, jsonschema
, marshmallow
@ -62,7 +62,7 @@ buildPythonPackage rec {
flask_login
flask-openid
flask_sqlalchemy
flask_wtf
flask-wtf
flask-jwt-extended
jsonschema
marshmallow

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

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, flask
, flask_wtf
, flask-wtf
, mongoengine
, six
, nose
@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
email_validator
flask
flask_wtf
flask-wtf
mongoengine
six
];

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

@ -27,7 +27,7 @@
, flask
, flask_login
, flask_principal
, flask_wtf
, flask-wtf
, itsdangerous
, passlib
@ -58,7 +58,7 @@ buildPythonPackage rec {
flask
flask_login
flask_principal
flask_wtf
flask-wtf
itsdangerous
passlib
];

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

@ -1,17 +1,36 @@
{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
{ lib
, fetchPypi
, buildPythonPackage
, flask
, itsdangerous
, wtforms
, email_validator
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "Flask-WTF";
version = "1.0.0";
pname = "flask-wtf";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "872fbb17b5888bfc734edbdcf45bc08fb365ca39f69d25dc752465a455517b28";
pname = "Flask-WTF";
inherit version;
sha256 = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9";
};
propagatedBuildInputs = [ flask wtforms nose ];
propagatedBuildInputs = [
flask
itsdangerous
wtforms
];
doCheck = false; # requires external service
passthru.optional-dependencies = {
email = [ email_validator ];
};
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Simple integration of Flask and WTForms.";

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

@ -19,7 +19,7 @@
, flask-restful
, flask_sqlalchemy
, flask-talisman
, flask_wtf
, flask-wtf
, debts
, idna
, itsdangerous
@ -64,7 +64,7 @@ buildPythonPackage rec {
flask
flask_mail
flask_migrate
flask_wtf
flask-wtf
flask-babel
flask-cors
flask-restful

5
pkgs/development/python-modules/wtforms/default.nix
View file

@ -9,10 +9,11 @@
buildPythonPackage rec {
version = "3.0.1";
pname = "WTForms";
pname = "wtforms";
src = fetchPypi {
inherit pname version;
pname = "WTForms";
inherit version;
sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";
};

7
pkgs/development/tools/literate-programming/nuweb/default.nix
View file

@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -ie 's|nuweb -r|./nuweb -r|' Makefile
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: global.o:/build/nuweb-1.60/global.h:91: multiple definition of
# `current_sector'; main.o:/build/nuweb-1.60/global.h:91: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
buildPhase = ''
make nuweb
make nuweb.pdf nuwebdoc.pdf all

4
pkgs/development/tools/quick-lint-js/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "quick-lint-js";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "quick-lint";
repo = "quick-lint-js";
rev = version;
sha256 = "122z6wnmf5lk6pvwj5065470kvkbb8jqc32x0nw6103fnak5cyih";
sha256 = "0vx6fddd0y8p27znv0ah0gjigs9hkifz132vzsnfg7w4s5az4fiy";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/games/ddnet/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.0.3";
version = "16.1";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-9hjVAtnn+dTBNCu6E90CtjGTAStmVTsQFm2UYq68xcM=";
sha256 = "sha256-9qKGaISEHtfKLmTGWLgOz4vfq7BqvDr17AdjCqPDu+Q=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];

7
pkgs/os-specific/darwin/moltenvk/default.nix
View file

@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
QuartzCore
];
outputs = [ "out" "bin" ];
outputs = [ "out" "bin" "dev" ];
# MoltenVK requires specific versions of its dependencies.
# Pin them here except for cereal, which is four years old and has several CVEs.
@ -170,15 +170,16 @@ stdenvNoCC.mkDerivation rec {
'';
installPhase = ''
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin"
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" "$dev/include/MoltenVK"
cp outputs/bin/MoltenVKShaderConverter "$bin/bin/"
cp outputs/lib/libMoltenVK.dylib "$out/lib/"
cp MoltenVK/MoltenVK/API/* "$dev/include/MoltenVK"
${cctools}/bin/install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib"
# FIXME: https://github.com/NixOS/nixpkgs/issues/148189
/usr/bin/codesign -s - -f "$out/lib/libMoltenVK.dylib"
install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json"
substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \
--replace ./libMoltenVK.dylib "$out/share/vulkan/icd.d/MoltenVK_icd.json"
--replace ./libMoltenVK.dylib "$out/lib/libMoltenVK.dylib"
'';
sandboxProfile = ''

2
pkgs/servers/calibre-web/default.nix
View file

@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
flask-babel
flask_login
flask_principal
flask_wtf
flask-wtf
iso-639
lxml
pypdf3

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

@ -34,7 +34,7 @@ let
flask_mail
flask_migrate
flask_sqlalchemy
flask_wtf
flask-wtf
flask-compress
passlib
pytz

37
pkgs/tools/graphics/vulkan-tools/default.nix
View file

@ -14,6 +14,9 @@
, vulkan-loader
, wayland
, wayland-protocols
, moltenvk
, AppKit
, Cocoa
}:
stdenv.mkDerivation rec {
@ -38,20 +41,45 @@ stdenv.mkDerivation rec {
buildInputs = [
glslang
vulkan-headers
vulkan-loader
] ++ lib.optionals (!stdenv.isDarwin) [
libffi
libX11
libXau
libxcb
libXdmcp
libXrandr
vulkan-headers
vulkan-loader
wayland
wayland-protocols
] ++ lib.optionals stdenv.isDarwin [
moltenvk
moltenvk.dev
AppKit
Cocoa
];
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
patches = [
# Vulkan-Tools expects to find the MoltenVK ICD and `libMoltenVK.dylib` in its source repo.
# Patch it to use the already-built binaries and ICD in nixpkgs.
./use-nix-moltenvk.patch
];
# vkcube.app and vkcubepp.app require `ibtool`, but the version in `xib2nib` is not capable of
# building these apps. Build them using `ibtool` from Xcode, but don’t allow any other binaries
# into the sandbox. Note that the CLT are not supported because `ibtool` requires Xcode.
sandboxProfile = lib.optionalString stdenv.isDarwin ''
(allow process-exec
(literal "/usr/bin/ibtool")
(regex "/Xcode.app/Contents/Developer/usr/bin/ibtool")
(regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild"))
(allow file-read*)
(deny file-read* (subpath "/usr/local") (with no-log))
(allow file-write* (subpath "/private/var/folders"))
'';
dontPatchELF = true;
cmakeFlags = [
@ -62,6 +90,9 @@ stdenv.mkDerivation rec {
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
# Hide dev warnings that are useless for packaging
"-Wno-dev"
] ++ lib.optionals stdenv.isDarwin [
"-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d"
"-DIBTOOL=/usr/bin/ibtool"
];
meta = with lib; {
@ -72,7 +103,7 @@ stdenv.mkDerivation rec {
use of the Vulkan API.
'';
homepage = "https://github.com/KhronosGroup/Vulkan-Tools";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
};

155
pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch Normal file
View file

@ -0,0 +1,155 @@
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
index 616fbc96..d2811c8d 100644
--- a/cube/CMakeLists.txt
+++ b/cube/CMakeLists.txt
@@ -262,14 +262,7 @@ else()
endif()
if(APPLE)
- # Keep RPATH so fixup_bundle can use it to find libraries
- set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
- install(TARGETS vkcube BUNDLE DESTINATION "cube")
- # Fix up the library references to be self-contained within the bundle.
- install(CODE "
- include(BundleUtilities)
- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\")
- ")
+ install(TARGETS vkcube BUNDLE DESTINATION "Applications")
else()
install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
@@ -309,14 +302,7 @@ else()
endif()
if(APPLE)
- # Keep RPATH so fixup_bundle can use it to find libraries
- set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
- install(TARGETS vkcubepp BUNDLE DESTINATION "cube")
- # Fix up the library references to be self-contained within the bundle.
- install(CODE "
- include(BundleUtilities)
- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\")
- ")
+ install(TARGETS vkcubepp BUNDLE DESTINATION "Applications")
else()
install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake
index 9b823f95..238c3e67 100644
--- a/cube/macOS/cube/cube.cmake
+++ b/cube/macOS/cube/cube.cmake
@@ -72,12 +69,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
# Copy the MoltenVK lib into the bundle.
if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
add_custom_command(TARGET vkcube POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
DEPENDS vulkan)
else()
add_custom_command(TARGET vkcube POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
DEPENDS vulkan)
endif()
diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake
index eae4de3c..0acd18f9 100644
--- a/cube/macOS/cubepp/cubepp.cmake
+++ b/cube/macOS/cubepp/cubepp.cmake
@@ -74,12 +71,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
# Copy the MoltenVK lib into the bundle.
if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
add_custom_command(TARGET vkcubepp POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
DEPENDS vulkan)
else()
add_custom_command(TARGET vkcubepp POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks
+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
DEPENDS vulkan)
endif()
diff --git a/mac_common.cmake b/mac_common.cmake
index bad3c414..b498906d 100644
--- a/mac_common.cmake
+++ b/mac_common.cmake
@@ -23,9 +23,8 @@ set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT})
# MoltenVK JSON File
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json)
-execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json
- OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json)
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json
+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json)
# ~~~
# Modify the ICD JSON file to adjust the library path.
@@ -36,10 +35,9 @@ execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*
# ~~~
add_custom_target(MoltenVK_icd-staging-json ALL
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json
- COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
- VERBATIM
- DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json")
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json
+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
+ DEPENDS "${MOLTENVK_DIR}/MoltenVK_icd.json")
set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE)
find_library(COCOA NAMES Cocoa)
diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt
index fb236a5b..3c8270d4 100644
--- a/vulkaninfo/CMakeLists.txt
+++ b/vulkaninfo/CMakeLists.txt
@@ -139,9 +139,4 @@ elseif(APPLE)
add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT)
endif()
-if(APPLE)
- install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")
-else()
- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
-
+install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/vulkaninfo/macOS/vulkaninfo.cmake b/vulkaninfo/macOS/vulkaninfo.cmake
index 9614530e..56af3b89 100644
--- a/vulkaninfo/macOS/vulkaninfo.cmake
+++ b/vulkaninfo/macOS/vulkaninfo.cmake
@@ -48,26 +48,4 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
MACOSX_PACKAGE_LOCATION
"Resources/vulkan/icd.d")
-# Xcode projects need some extra help with what would be install steps.
-if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
- ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib
- DEPENDS vulkan)
-else()
- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
- ${CMAKE_CURRENT_BINARY_DIR}/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib
- DEPENDS vulkan)
-endif()
-
-# Keep RPATH so fixup_bundle can use it to find libraries
-set_target_properties(vulkaninfo-bundle PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-install(TARGETS vulkaninfo-bundle BUNDLE DESTINATION "vulkaninfo")
-# Fix up the library search path in the executable to find (loader) libraries in the bundle. When fixup_bundle() is passed a bundle
-# in the first argument, it looks at the Info.plist file to determine the BundleExecutable. In this case, the executable is a
-# script, which can't be fixed up. Instead pass it the explicit name of the executable.
-install(CODE "
- include(BundleUtilities)
- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/vulkaninfo/vulkaninfo.app/Contents/MacOS/vulkaninfo \"\" \"${Vulkan_LIBRARY_DIR}\")
- ")
+install(TARGETS vulkaninfo-bundle BUNDLE DESTINATION "Applications")

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

@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: bookmark.o: (.bss+0x20): multiple definition of `gBm';
# gpshare.o:(.bss+0x0): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preConfigure = ''
find -name Makefile.in | xargs sed -i '/^TMPDIR=/d'

22
pkgs/tools/security/onlykey-agent/default.nix
View file

@ -4,18 +4,30 @@
}:
let
bech32 = with python3Packages; buildPythonPackage rec {
pname = "bech32";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk=";
};
};
# onlykey requires a patched version of libagent
lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{
version = "1.0.2";
version = "1.0.4";
src = fetchPypi {
inherit version;
pname = "lib-agent";
sha256 = "sha256-NAimivO3m4UUPM4JgLWGq2FbXOaXdQEL/DqZAcy+kEw=";
sha256 = "sha256-MwtufyJVPWuK7bbX+9Kv6wEi/zq4ftXrfjrMOYpcIfc=";
};
propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [
pynacl
bech32
cryptography
docutils
pycryptodome
pynacl
wheel
];
@ -32,11 +44,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "onlykey-agent";
version = "1.1.11";
version = "1.1.13";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-YH/cqQOVy5s6dTp2JwxM3s4xRTXgwhOr00whtHAwZZI=";
sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc=";
};
propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ];

4
pkgs/tools/security/onlykey-cli/default.nix
View file

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "onlykey-cli";
version = "1.2.5";
version = "1.2.9";
src = python3Packages.fetchPypi {
inherit version;
pname = "onlykey";
sha256 = "sha256-7Pr1gXaPF5mctGxDciKKj0YDDQVFFi1+t6QztoKqpAA=";
sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A=";
};
propagatedBuildInputs = with python3Packages; [

1718
pkgs/tools/security/onlykey/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

2
pkgs/tools/security/onlykey/onlykey.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;

2
pkgs/tools/security/onlykey/package.json
View file

@ -1,3 +1,3 @@
[
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.3"}
{"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.4"}
]

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

@ -1736,7 +1736,7 @@ with pkgs;
archivemount = callPackage ../tools/filesystems/archivemount { };
archivy = python3Packages.callPackage ../applications/misc/archivy { };
archivy = callPackage ../applications/misc/archivy { };
arandr = callPackage ../tools/X11/arandr { };
@ -21024,7 +21024,10 @@ with pkgs;
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
inherit (darwin) moltenvk;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };

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

@ -67,6 +67,7 @@ mapAliases ({
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
flask_testing = flask-testing; # added 2022-04-25
flask_wtf = flask-wtf; # added 2022-05-24
garminconnect-ha = garminconnect; # added 2022-02-05
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28

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

@ -3122,7 +3122,7 @@ in {
flask-versioned = callPackage ../development/python-modules/flask-versioned { };
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
flask-wtf = callPackage ../development/python-modules/flask-wtf { };
flatbuffers = callPackage ../development/python-modules/flatbuffers {
inherit (pkgs) flatbuffers;