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-02-17 18:01:43 +00:00 committed by GitHub
parent 4b17017864 bf0da6f842
commit fae9a3bb4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 965 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@
</p>
<p align="center">
<a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a>
<a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
<a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a>
</p>

20
maintainers/maintainer-list.nix
View file

@ -1200,6 +1200,12 @@
githubId = 262763;
name = "Ayaz Hafiz";
};
azuwis = {
email = "azuwis@gmail.com";
github = "azuwis";
githubId = 9315;
name = "Zhong Jianxin";
};
b4dm4n = {
email = "fabianm88@gmail.com";
github = "B4dM4n";
@ -10115,6 +10121,20 @@
githubId = 16624;
name = "Maxim Ivanov";
};
reckenrode = {
name = "Randy Eckenrode";
email = "randy@largeandhighquality.com";
matrix = "@reckenrode:matrix.org";
github = "reckenrode";
githubId = 7413633;
keys = [
# compare with https://keybase.io/reckenrode
{
longkeyid = "ed25519/0xFBF19A982CCE0048";
fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048";
}
];
};
redfish64 = {
email = "engler@gmail.com";
github = "redfish64";

7
nixos/modules/system/boot/tmp.nix
View file

@ -48,7 +48,12 @@ in
what = "tmpfs";
where = "/tmp";
type = "tmpfs";
mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ];
mountConfig.Options = concatStringsSep "," [ "mode=1777"
"strictatime"
"rw"
"nosuid"
"nodev"
"size=${toString cfg.tmpOnTmpfsSize}" ];
}
];

6
nixos/tests/bpf.nix
View file

@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
# simple BEGIN probe (user probe on bpftrace itself)
print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'"))
# tracepoint
print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'"))
print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'"))
# kprobe
print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))
# BTF
print(machine.succeed("bpftrace -e 'kprobe:schedule { "
" printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() "
"}'"))
'';
})

4
pkgs/applications/audio/pyradio/default.nix
View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.8.9.10";
version = "0.8.9.12";
propagatedBuildInputs = with python3Packages; [
requests
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
owner = "coderholic";
repo = pname;
rev = version;
sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w";
sha256 = "sha256-ZBlb0wpw5/s3JuyV2OpGZwlY1UcQzLHP1/VhGlEr6Zo=";
};
checkPhase = ''

4
pkgs/applications/audio/tauon/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "tauon";
version = "7.0.1";
version = "7.1.0";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ=";
sha256 = "sha256-p48fVuigfQuFrCUnTD5NTFtgiO3WaBeKOhGLoQU4O5U=";
};
postPatch = ''

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-24";
version = "7.1.0-25";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo=";
hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

76
pkgs/applications/graphics/rnote/default.nix Normal file
View file

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, desktop-file-utils
, gio-sharp
, glib
, gstreamer
, gtk4
, libadwaita
, libxml2
, meson
, ninja
, pkg-config
, poppler
, python3
, rustPlatform
, shared-mime-info
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.3.5";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM=";
};
nativeBuildInputs = [
desktop-file-utils # For update-desktop-database
meson
ninja
pkg-config
python3 # For the postinstall script
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
shared-mime-info # For update-mime-database
wrapGAppsHook4
];
buildInputs = [
gio-sharp
glib
gstreamer
gtk4
libadwaita
libxml2
poppler
];
postPatch = ''
pushd build-aux
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
popd
'';
meta = with lib; {
homepage = "https://github.com/flxzt/rnote";
description = "Simple drawing application to create handwritten notes";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda yrd ];
platforms = platforms.linux;
};
}

82
pkgs/applications/graphics/solvespace/default.nix
View file

@ -1,27 +1,77 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, wrapGAppsHook
, at-spi2-core
, cairo
, dbus
, freetype
, fontconfig
, glew
, gtkmm3
, json_c
, libdatrie
, libepoxy
, libGLU
, libpng
, libselinux
, libsepol
, libthai
, libxkbcommon
, pangomm
, pcre
, util-linuxMinimal # provides libmount
, xorg
, zlib
}:
stdenv.mkDerivation rec {
pname = "solvespace";
version = "v3.0";
version = "3.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9";
rev = "v${version}";
hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE=";
fetchSubmodules = true;
};
nativeBuildInputs = [
pkg-config cmake wrapGAppsHook
];
buildInputs = [
zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew libGLU
xorg.libpthreadstubs xorg.libXdmcp pcre
cmake
pkg-config
wrapGAppsHook
];
preConfigure = ''
buildInputs = [
at-spi2-core
cairo
dbus
freetype
fontconfig
glew
gtkmm3
json_c
libdatrie
libepoxy
libGLU
libpng
libselinux
libsepol
libthai
libxkbcommon
pangomm
pcre
util-linuxMinimal
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXtst
zlib
];
postPatch = ''
patch CMakeLists.txt <<EOF
@@ -20,9 +20,9 @@
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
@ -35,16 +85,14 @@ stdenv.mkDerivation rec {
EOF
'';
postInstall = ''
substituteInPlace $out/share/applications/solvespace.desktop \
--replace /usr/bin/ $out/bin/
'';
cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
meta = with lib; {
description = "A parametric 3d CAD program";
license = licenses.gpl3Plus;
maintainers = [ maintainers.edef ];
platforms = platforms.linux;
homepage = "http://solvespace.com";
homepage = "https://solvespace.com";
changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md";
};
}

4
pkgs/applications/misc/gpxsee/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "10.3";
version = "10.4";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ=";
sha256 = "sha256-3AwUfx8IIWJO4uVAhXJE5Oola+60VUpXUwmALqJo2vw=";
};
patches = (substituteAll {

11
pkgs/applications/misc/mediaelch/default.nix
View file

@ -1,7 +1,10 @@
{ lib
, mkDerivation
, fetchFromGitHub
, qmake
, qttools
, curl
, ffmpeg
, libmediainfo
@ -10,7 +13,6 @@
, qtdeclarative
, qtmultimedia
, qtsvg
, qttools
, quazip
}:
@ -28,7 +30,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ];
buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ];
qmakeFlags = [
"USE_EXTERN_QUAZIP=${quazip}/include/quazip5"
@ -38,6 +40,11 @@ mkDerivation rec {
substituteInPlace MediaElch.pro --replace "/usr" "$out"
'';
qtWrapperArgs = [
# libmediainfo.so.0 is loaded dynamically
"--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib"
];
meta = with lib; {
homepage = "https://mediaelch.de/mediaelch/";
description = "Media Manager for Kodi";

9
pkgs/development/libraries/libdbusmenu/default.nix
View file

@ -7,14 +7,11 @@
with lib;
stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}";
in "libdbusmenu-${postfix}-${version}";
version = "${versionMajor}.${versionMinor}";
versionMajor = "16.04";
versionMinor = "0";
pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
version = "16.04.0";
src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz";
url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz";
sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
};

6
pkgs/development/libraries/libmysqlconnectorcpp/default.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libmysqlconnectorcpp";
version = "8.0.27";
version = "8.0.28";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c=";
sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs=";
};
nativeBuildInputs = [
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://dev.mysql.com/downloads/connector/cpp/";
description = "C++ library for connecting to mysql servers";
license = lib.licenses.gpl2;
license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/libraries/ndpi/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ndpi";
version = "4.0";
version = "4.2";
src = fetchFromGitHub {
owner = "ntop";
repo = "nDPI";
rev = version;
sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x";
sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ=";
};
configureScript = "./autogen.sh";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nDPI is a library for deep-packet inspection based on OpenDPI.
'';
homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/";
license = with licenses; lgpl3;
license = with licenses; [ lgpl3Plus bsd3 ];
maintainers = with maintainers; [ takikawa ];
platforms = with platforms; unix;
};

2
pkgs/development/libraries/vulkan-headers/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Vulkan Header files and API registry";
homepage = "https://www.lunarg.com";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
};

14
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }:
, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }:
stdenv.mkDerivation rec {
pname = "vulkan-loader";
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
});
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ];
buildInputs = [ vulkan-headers ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ];
cmakeFlags = [
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
];
cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";
outputs = [ "out" "dev" ];
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
};

12
pkgs/development/python-modules/aio-geojson-client/default.nix
View file

@ -8,17 +8,21 @@
, haversine
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aio-geojson-client";
version = "0.15";
version = "0.16";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-client";
rev = "v${version}";
sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3";
hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM=";
};
propagatedBuildInputs = [
@ -34,7 +38,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_client" ];
pythonImportsCheck = [
"aio_geojson_client"
];
meta = with lib; {
description = "Python module for accessing GeoJSON feeds";

12
pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
View file

@ -7,17 +7,21 @@
, pytest-asyncio
, pytestCheckHook
, pytz
, pythonOlder
}:
buildPythonPackage rec {
pname = "aio-geojson-geonetnz-quakes";
version = "0.13";
version = "0.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-geojson-geonetnz-quakes";
rev = "v${version}";
sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA=";
hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U=";
};
propagatedBuildInputs = [
@ -32,7 +36,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ];
pythonImportsCheck = [
"aio_geojson_geonetnz_quakes"
];
meta = with lib; {
description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds";

4
pkgs/development/python-modules/azure-mgmt-compute/default.nix
View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "25.0.0";
version = "26.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk=";
sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
View file

@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "georss-ign-sismologia-client";
version = "0.4";
version = "0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-ign-sismologia-client";
rev = "v${version}";
sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g=";
hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg=";
};
propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "georss_ign_sismologia_client" ];
pythonImportsCheck = [
"georss_ign_sismologia_client"
];
meta = with lib; {
description = "Python library for accessing the IGN Sismologia GeoRSS feed";

10
pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix
View file

@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "georss-nrcan-earthquakes-client";
version = "0.3";
version = "0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-nrcan-earthquakes-client";
rev = "v${version}";
sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l";
hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro=";
};
propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ];
pythonImportsCheck = [
"georss_nrcan_earthquakes_client"
];
meta = with lib; {
description = "Python library for accessing Natural Resources Canada Earthquakes feed";

8
pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
View file

@ -9,13 +9,15 @@
buildPythonPackage rec {
pname = "georss-qld-bushfire-alert-client";
version = "0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-qld-bushfire-alert-client";
rev = "v${version}";
sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
};
propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ];
pythonImportsCheck = [
"georss_qld_bushfire_alert_client"
];
meta = with lib; {
description = "Python library for accessing Queensland Bushfire Alert feed";

8
pkgs/development/python-modules/georss-tfs-incidents-client/default.nix
View file

@ -9,13 +9,15 @@
buildPythonPackage rec {
pname = "georss-tfs-incidents-client";
version = "0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-tfs-incidents-client";
rev = "v${version}";
sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m";
hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y=";
};
propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "georss_tfs_incidents_client" ];
pythonImportsCheck = [
"georss_tfs_incidents_client"
];
meta = with lib; {
description = "Python library for accessing Tasmania Fire Service Incidents feed";

8
pkgs/development/python-modules/georss-wa-dfes-client/default.nix
View file

@ -9,13 +9,15 @@
buildPythonPackage rec {
pname = "georss-wa-dfes-client";
version = "0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-wa-dfes-client";
rev = "v${version}";
sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7";
hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU=";
};
propagatedBuildInputs = [
@ -26,7 +28,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "georss_wa_dfes_client" ];
pythonImportsCheck = [
"georss_wa_dfes_client"
];
meta = with lib; {
description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed";

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.10.4";
version = "2.10.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY=";
sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

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

@ -14,6 +14,7 @@
, numpy
, pandas
, parsy
, poetry-core
, pyarrow
, pytest
, pytest-mock
@ -49,7 +50,7 @@ in
buildPythonPackage rec {
pname = "ibis-framework";
version = "2.1.1";
format = "setuptools";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -60,6 +61,8 @@ buildPythonPackage rec {
sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
atpublic
cached-property
@ -77,7 +80,7 @@ buildPythonPackage rec {
sqlalchemy
tables
toolz
] ++ lib.optionals (pythonOlder "3.8") [
] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [
importlib-metadata
];
@ -90,8 +93,13 @@ buildPythonPackage rec {
];
postPatch = ''
substituteInPlace setup.py \
--replace "atpublic>=2.3,<3" "atpublic>=2.3"
substituteInPlace pyproject.toml \
--replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"'
'';
preBuild = ''
# setup.py exists only for developer convenience and is automatically generated
rm setup.py
'';
disabledTests = [
@ -135,7 +143,7 @@ buildPythonPackage rec {
done
wait
'' + lib.optionalString (lib.versionOlder version "3.0.0") ''
export PYTEST_BACKENDS="${backendsString}"
'';

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "python-keycloak";
version = "0.26.1";
version = "0.27.0";
src = fetchFromGitHub {
owner = "marcospereirampj";
repo = "python-keycloak";
rev = version;
sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo=";
sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/oclgrind/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "oclgrind";
version = "19.10";
version = "21.10";
src = fetchFromGitHub {
owner = "jrprice";
repo = "oclgrind";
rev = "v${version}";
sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn";
sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/tools/analysis/pmd/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pmd";
version = "6.41.0";
version = "6.42.0";
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k=";
sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs=";
};
nativeBuildInputs = [ unzip makeWrapper ];
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://pmd.github.io/";
changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html";
platforms = platforms.unix;
license = with licenses; [ bsdOriginal asl20 lgpl3Plus ];
license = with licenses; [ bsdOriginal asl20 ];
};
}

4
pkgs/development/tools/analysis/randoop/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
version = "4.2.6";
version = "4.3.0";
pname = "randoop";
src = fetchurl {
url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0=";
sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ=";
};
nativeBuildInputs = [ unzip ];

27
pkgs/development/tools/omniorb/default.nix
View file

@ -1,23 +1,36 @@
{ lib, stdenv, fetchurl, python2 }:
{ lib
, stdenv
, fetchurl
, pkg-config
, python3
}:
stdenv.mkDerivation rec {
pname = "omniorb";
version = "4.2.4";
version = "4.3.0";
src = fetchurl {
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18";
hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0=";
};
buildInputs = [ python2 ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ python3 ];
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
meta = with lib; {
description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
description = "A robust high performance CORBA ORB for C++ and Python";
longDescription = ''
omniORB is a robust high performance CORBA ORB for C++ and Python.
It is freely available under the terms of the GNU Lesser General Public License
(for the libraries),and GNU General Public License (for the tools).
omniORB is largely CORBA 2.6 compliant.
'';
homepage = "http://omniorb.sourceforge.net/";
license = licenses.gpl2Plus;
license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ smironov ];
platforms = platforms.unix;
};

6
pkgs/development/tools/sd-local/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sd-local";
version = "1.0.32";
version = "1.0.40";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA=";
sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU=";
};
vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI=";
vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y=";
subPackages = [ "." ];

2
pkgs/development/tools/spirv-tools/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
license = licenses.asl20;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.ralith ];
};
}

4
pkgs/games/osu-lazer/default.nix
View file

@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2022.118.0";
version = "2022.205.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk=";
sha256 = "sha256-CzXgj3990qWOwIjhbU8vO29nDO/7HrGDtsc67VIenPI=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

15
pkgs/games/osu-lazer/deps.nix generated
View file

@ -111,8 +111,10 @@
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; })
@ -153,14 +155,16 @@
(fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; })
(fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; })
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; })
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; })
(fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; })
(fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.204.0"; sha256 = "1dwg45k1qhxj4mhxw49djmab800yi7z7qnvl8ipicli4lg9k5lvf"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.204.0"; sha256 = "1v4kfphjbkcxswx11c7xh93jwpsyvnskc0zia91d5bp5d11y3z32"; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; })
(fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; })
(fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; })
(fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; })
@ -298,6 +302,7 @@
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })

6
pkgs/games/pentobi/default.nix
View file

@ -3,14 +3,14 @@
}:
mkDerivation rec {
version = "19.1";
version = "20.0";
pname = "pentobi";
src = fetchFromGitHub {
owner = "enz";
repo = "pentobi";
rev = "v${version}";
sha256 = "sha256-opJPMvaE8fDoGaBNHySqr/LRU/UPP6292G+nYyBBL08=";
sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8=";
};
nativeBuildInputs = [ cmake docbook_xsl qttools ];
@ -31,7 +31,7 @@ mkDerivation rec {
meta = with lib; {
description = "A computer opponent for the board game Blokus";
homepage = "https://pentobi.sourceforge.io";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.linux;
};

12
pkgs/misc/vim-plugins/generated.nix
View file

@ -207,6 +207,18 @@ final: prev:
meta.homepage = "https://github.com/skywind3000/asyncrun.vim";
};
asynctasks-vim = buildVimPluginFrom2Nix {
pname = "asynctasks.vim";
version = "2022-01-12";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "asynctasks.vim";
rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c";
sha256 = "cw61N5K6GHwdT011oeFV+jzFw9tk4xahPcTnx5jwqPA=";
};
meta.homepage = "https://github.com/skywind3000/asynctasks.vim";
};
ats-vim = buildVimPluginFrom2Nix {
pname = "ats-vim";
version = "2020-09-04";

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -762,6 +762,7 @@ sjl/gundo.vim
sjl/splice.vim
sk1418/last256
skywind3000/asyncrun.vim
skywind3000/asynctasks.vim
slashmili/alchemist.vim
smiteshp/nvim-gps
sodapopcan/vim-twiggy

146
pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch Normal file
View file

@ -0,0 +1,146 @@
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
index c23afce4..12ac12f4 100644
--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
+++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -365,13 +365,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD;
- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS";
- };
2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
@@ -400,20 +393,6 @@
remoteGlobalIDString = A93903C71C57E9ED00FE90DC;
remoteInfo = "MVKSPIRVToMSLConverter-macOS";
};
- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A93903B81C57E9D700FE90DC;
- remoteInfo = "MVKSPIRVToMSLConverter-iOS";
- };
- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = A9092A8C1A81717B00051823;
- remoteInfo = MoltenVKShaderConverter;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@@ -1019,7 +998,6 @@
buildRules = (
);
dependencies = (
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */,
);
name = "MoltenVK-tvOS";
productName = MoltenVK;
@@ -1039,7 +1017,6 @@
buildRules = (
);
dependencies = (
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */,
);
name = "MoltenVK-iOS";
productName = MoltenVK;
@@ -1059,7 +1036,6 @@
buildRules = (
);
dependencies = (
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */,
);
name = "MoltenVK-macOS";
productName = MoltenVK;
@@ -1476,24 +1452,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MoltenVKSPIRVToMSLConverter-tvOS";
- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */;
- };
- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "MVKSPIRVToMSLConverter-iOS";
- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */;
- };
- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = MoltenVKShaderConverter;
- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
2FEA0AB824902F9F00EEF3AD /* Debug */ = {
isa = XCBuildConfiguration;
@@ -1586,11 +1544,12 @@
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/include\"",
- "\"$(SRCROOT)/../MoltenVKShaderConverter\"",
- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"",
- "\"$(SRCROOT)/../External/cereal/include\"",
- "\"${BUILT_PRODUCTS_DIR}\"",
+ "@@sourceRoot@@/outputs/include",
+ "@@sourceRoot@@/outputs/include/simd_workaround",
+ "@@sourceRoot@@/MoltenVKShaderConverter",
+ "@@cereal@@/include",
+ "@@spirv-cross@@/include/spirv_cross",
+ "@@vulkan-headers@@/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACH_O_TYPE = staticlib;
@@ -1600,6 +1559,10 @@
MVK_SKIP_DYLIB = "";
"MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES;
"MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES;
+ OTHER_CFLAGS = (
+ "-isystem",
+ "@@libcxx@@/include/c++/v1",
+ );
PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a";
PRODUCT_NAME = MoltenVK;
SKIP_INSTALL = YES;
@@ -1658,11 +1621,12 @@
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_MASTER_OBJECT_FILE = YES;
HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/include\"",
- "\"$(SRCROOT)/../MoltenVKShaderConverter\"",
- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"",
- "\"$(SRCROOT)/../External/cereal/include\"",
- "\"${BUILT_PRODUCTS_DIR}\"",
+ "@@sourceRoot@@/outputs/include",
+ "@@sourceRoot@@/outputs/include/simd_workaround",
+ "@@sourceRoot@@/MoltenVKShaderConverter",
+ "@@cereal@@/include",
+ "@@spirv-cross@@/include/spirv_cross",
+ "@@vulkan-headers@@/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACH_O_TYPE = staticlib;
@@ -1672,6 +1636,10 @@
MVK_SKIP_DYLIB = "";
"MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES;
"MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES;
+ OTHER_CFLAGS = (
+ "-isystem",
+ "@@libcxx@@/include/c++/v1",
+ );
PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a";
PRODUCT_NAME = MoltenVK;
SKIP_INSTALL = YES;

180
pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch Normal file
View file

@ -0,0 +1,180 @@
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
index c7842b63..d55f73ed 100644
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 52;
+ objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */
@@ -33,9 +33,6 @@
A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; };
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; };
A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; };
A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; };
@@ -55,12 +52,6 @@
A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; };
A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; };
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; };
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; };
A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; };
A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; };
A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; };
@@ -115,9 +106,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -134,9 +122,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -144,9 +129,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */,
- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */,
- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -313,7 +295,7 @@
A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */,
);
name = MoltenVKShaderConverter;
- productName = MetalGLShaderConverterTool;
+ productName = MoltenVKShaderConverter;
productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */;
productType = "com.apple.product-type.tool";
};
@@ -349,7 +331,7 @@
dependencies = (
);
name = "MoltenVKShaderConverter-macOS";
- productName = "MetalGLShaderConverter-macOS";
+ productName = MoltenVKShaderConverter;
productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */;
productType = "com.apple.product-type.library.static";
};
@@ -536,6 +518,17 @@
OTHER_LDFLAGS = (
"-ObjC",
"-w",
+ "-lMachineIndependent",
+ "-lGenericCodeGen",
+ "-lOGLCompiler",
+ "-lglslang",
+ "-lOSDependent",
+ "-lSPIRV",
+ "-lSPIRV-Tools",
+ "-lSPIRV-Tools-opt",
+ "-lspirv-cross-msl",
+ "-lspirv-cross-core",
+ "-lspirv-cross-glsl",
);
SDKROOT = macosx;
};
@@ -548,6 +541,17 @@
OTHER_LDFLAGS = (
"-ObjC",
"-w",
+ "-lMachineIndependent",
+ "-lGenericCodeGen",
+ "-lOGLCompiler",
+ "-lglslang",
+ "-lOSDependent",
+ "-lSPIRV",
+ "-lSPIRV-Tools",
+ "-lSPIRV-Tools-opt",
+ "-lspirv-cross-msl",
+ "-lspirv-cross-core",
+ "-lspirv-cross-glsl",
);
SDKROOT = macosx;
};
@@ -624,15 +628,24 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
HEADER_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- "\"$(SRCROOT)/SPIRV-Cross\"",
- "\"$(SRCROOT)/glslang\"",
- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
+ "@@sourceRoot@@/Common",
+ "@@glslang@@/include",
+ "@@spirv-cross@@/include/spirv_cross",
+ "@@spirv-tools@@/include",
+ "@@spirv-headers@@/include/spirv/unified1/",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ LIBRARY_SEARCH_PATHS = (
+ "@@glslang@@/lib",
+ "@@spirv-cross@@/lib",
+ "@@spirv-tools@@/lib",
+ );
MACH_O_TYPE = staticlib;
MACOSX_DEPLOYMENT_TARGET = 10.11;
+ OTHER_CFLAGS = (
+ "-isystem",
+ "@@libcxx@@/include/c++/v1",
+ );
PRODUCT_NAME = MoltenVKShaderConverter;
SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -683,15 +696,24 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
HEADER_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)\"",
- "\"$(SRCROOT)/SPIRV-Cross\"",
- "\"$(SRCROOT)/glslang\"",
- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
+ "@@sourceRoot@@/Common",
+ "@@glslang@@/include",
+ "@@spirv-cross@@/include/spirv_cross",
+ "@@spirv-tools@@/include",
+ "@@spirv-headers@@/include/spirv/unified1/",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ LIBRARY_SEARCH_PATHS = (
+ "@@glslang@@/lib",
+ "@@spirv-cross@@/lib",
+ "@@spirv-tools@@/lib",
+ );
MACH_O_TYPE = staticlib;
MACOSX_DEPLOYMENT_TARGET = 10.11;
+ OTHER_CFLAGS = (
+ "-isystem",
+ "@@libcxx@@/include/c++/v1",
+ );
PRODUCT_NAME = MoltenVKShaderConverter;
SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0;

13
pkgs/os-specific/darwin/moltenvk/createDylib.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/Scripts/create_dylib.sh b/Scripts/create_dylib.sh
index 5ba75f67..a0405067 100755
--- a/Scripts/create_dylib.sh
+++ b/Scripts/create_dylib.sh
@@ -57,6 +57,8 @@ ${MVK_SAN} \
-framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework CoreGraphics ${MVK_IOKIT_FWK} -framework Foundation \
--library-directory ${MVK_USR_LIB_DIR} \
-o "${MVK_BUILT_PROD_DIR}/dynamic/${MVK_DYLIB_NAME}" \
+-L@@sourceRoot@@/outputs/lib -L@@glslang@@/lib -L@@spirv-tools@@/lib -L@@spirv-cross@@/lib \
+-lobjc -lMoltenVKShaderConverter -lGenericCodeGen -lMachineIndependent -lOGLCompiler -lOSDependent -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lspirv-cross-core -lspirv-cross-glsl -lspirv-cross-msl -lspirv-cross-reflect \
-force_load "${MVK_BUILT_PROD_DIR}/lib${PRODUCT_NAME}.a"
if test "$CONFIGURATION" = Debug; then

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

@ -0,0 +1,200 @@
{ lib
, stdenv
, stdenvNoCC
, fetchurl
, fetchFromGitHub
, cctools
, sigtool
, cereal
, glslang
, spirv-cross
, spirv-headers
, spirv-tools
, vulkan-headers
, AppKit
, Foundation
, Metal
, QuartzCore
}:
# Even though the derivation is currently impure, it is written to build successfully using
# `xcbuild`. Once the SDK on x86_64-darwin is updated, it should be possible to switch from being
# an impure derivation.
#
# The `sandboxProfile` was copied from the iTerm2 derivation. In order to build you at least need
# the `sandbox` option set to `relaxed` or `false`. Xcode should be available in the default
# location.
let
libcxx.dev = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr";
in
stdenvNoCC.mkDerivation rec {
pname = "MoltenVK";
version = "1.1.7";
buildInputs = [
AppKit
Foundation
Metal
QuartzCore
];
outputs = [ "out" "bin" ];
# MoltenVK requires specific versions of its dependencies.
# Pin them here except for cereal, which is four years old and has several CVEs.
passthru = {
glslang = (glslang.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf";
hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE=";
};
})).override {
inherit (passthru) spirv-headers spirv-tools;
};
spirv-cross = spirv-cross.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
"-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross"
];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Cross";
rev = "131278458ea8eebe6a6e9c476fbcf71278726e1a";
hash = "sha256-LrRYDFGv3Zxfy4qRNLwM2OOa8jbcq0ttPxDamCH21xU=";
};
});
spirv-headers = spirv-headers.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "spirv-headers";
rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78";
hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0";
};
});
spirv-tools = (spirv-tools.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "spirv-tools";
rev = "45dd184c790d6bfc78a5a74a10c37e888b1823fa";
hash = "sha256-DSqZlwfNTbN4fyIrVBKltm5U2U4GthW3L+Ksw4lSVG8=";
};
meta = old.meta // {
platforms = old.meta.platforms ++ lib.platforms.darwin;
};
})).override {
inherit (passthru) spirv-headers;
};
vulkan-headers = vulkan-headers.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "1dace16d8044758d32736eb59802d171970e9448";
hash = "sha256-C6YgxWcinI3QumcWmoJaiTAf0u6jSDc8sCIarn2t04k";
};
meta = old.meta // {
platforms = old.meta.platforms ++ lib.platforms.darwin;
};
});
};
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "MoltenVK";
rev = "v${version}";
hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw=";
};
patches = [
# Specify the libraries to link directly since XCFrameworks are not being used.
./createDylib.patch
# Move `mvkGitRevDerived.h` to a stable location
./gitRevHeaderStability.patch
# Fix the Xcode projects to play nicely with `xcbuild`.
./MoltenVKShaderConverter.xcodeproj.patch
./MoltenVK.xcodeproj.patch
];
postPatch = ''
substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
--replace @@sourceRoot@@ $(pwd) \
--replace @@libcxx@@ "${libcxx.dev}" \
--replace @@glslang@@ "${passthru.glslang}" \
--replace @@spirv-cross@@ "${passthru.spirv-cross}" \
--replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \
--replace @@spirv-headers@@ "${passthru.glslang.spirv-headers}"
substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \
--replace @@sourceRoot@@ $(pwd) \
--replace @@libcxx@@ "${libcxx.dev}" \
--replace @@cereal@@ "${cereal}" \
--replace @@spirv-cross@@ "${passthru.spirv-cross}" \
--replace @@vulkan-headers@@ "${passthru.vulkan-headers}"
substituteInPlace Scripts/create_dylib.sh \
--replace @@sourceRoot@@ $(pwd) \
--replace @@glslang@@ "${passthru.glslang}" \
--replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \
--replace @@spirv-cross@@ "${passthru.spirv-cross}"
substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
--replace @@sourceRoot@@ $(pwd) \
--replace '$(git rev-parse HEAD)' ${src.rev}
'';
dontConfigure = true;
buildPhase = ''
# Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`.
derived_data_path=$(pwd)/DerivedData
pushd MoltenVKShaderConverter
/usr/bin/xcodebuild build \
-jobs $NIX_BUILD_CORES \
-derivedDataPath "$derived_data_path" \
-configuration Release \
-project MoltenVKShaderConverter.xcodeproj \
-scheme MoltenVKShaderConverter \
-arch ${stdenv.targetPlatform.darwinArch}
popd
mkdir -p outputs/bin outputs/lib
declare -A outputs=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
for output in "''${!outputs[@]}"; do
cp DerivedData/Build/Products/Release/$output "outputs/''${outputs[$output]}/$output"
done
pushd MoltenVK
/usr/bin/xcodebuild build \
-jobs $NIX_BUILD_CORES \
-derivedDataPath "$derived_data_path" \
-configuration Release \
-project MoltenVK.xcodeproj \
-scheme MoltenVK-macOS \
-arch ${stdenv.targetPlatform.darwinArch}
popd
cp DerivedData/Build/Products/Release/dynamic/libMoltenVK.dylib outputs/lib/libMoltenVK.dylib
'';
installPhase = ''
mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin"
cp outputs/bin/MoltenVKShaderConverter "$bin/bin/"
cp outputs/lib/libMoltenVK.dylib "$out/lib/"
${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"
'';
sandboxProfile = ''
(allow file-read* file-write* process-exec mach-lookup)
; block homebrew dependencies
(deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log))
'';
meta = {
description = "A Vulkan Portability implementation built on top of Apple’s Metal API";
homepage = "https://github.com/KhronosGroup/MoltenVK";
changelog = "https://github.com/KhronosGroup/MoltenVK/releases";
maintainers = [ lib.maintainers.reckenrode ];
license = lib.licenses.asl20;
platforms = lib.platforms.darwin;
};
}

14
pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/Scripts/gen_moltenvk_rev_hdr.sh b/Scripts/gen_moltenvk_rev_hdr.sh
index c49ea4e6..9b7d13d1 100755
--- a/Scripts/gen_moltenvk_rev_hdr.sh
+++ b/Scripts/gen_moltenvk_rev_hdr.sh
@@ -2,7 +2,7 @@
# Record the MoltenVK GIT revision as a derived header file suitable for including in a build
MVK_GIT_REV=$(git rev-parse HEAD)
-MVK_HDR_FILE="${BUILT_PRODUCTS_DIR}/mvkGitRevDerived.h"
+MVK_HDR_FILE="@@sourceRoot@@/outputs/include/mvkGitRevDerived.h"
+mkdir -p $(dirname ${MVK_HDR_FILE})
echo "// Auto-generated by MoltenVK" > "${MVK_HDR_FILE}"
echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}"
-

44
pkgs/os-specific/darwin/sketchybar/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }:
let
inherit (stdenv.hostPlatform) system;
target = {
"aarch64-darwin" = "arm";
"x86_64-darwin" = "x86";
}.${system} or (throw "Unsupported system: ${system}");
in
stdenv.mkDerivation rec {
pname = "sketchybar";
version = "2.4.3";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SketchyBar";
rev = "v${version}";
sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb";
};
buildInputs = [ Carbon Cocoa SkyLight ];
postPatch = ''
sed -i -e '/^#include <malloc\/_malloc.h>/d' src/*.[ch] src/*/*.[ch]
'';
makeFlags = [
target
];
installPhase = ''
mkdir -p $out/bin
cp ./bin/sketchybar_${target} $out/bin/sketchybar
'';
meta = with lib; {
description = "A highly customizable macOS status bar replacement";
homepage = "https://github.com/FelixKratz/SketchyBar";
platforms = platforms.darwin;
maintainers = [ maintainers.azuwis ];
license = licenses.gpl3;
};
}

4
pkgs/os-specific/linux/bcc/default.nix
View file

@ -7,7 +7,7 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
version = "0.23.0";
version = "0.24.0";
disabled = !stdenv.isLinux;
@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec {
owner = "iovisor";
repo = "bcc";
rev = "v${version}";
sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE=";
sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ=";
};
format = "other";

11
pkgs/os-specific/linux/libbpf/default.nix
View file

@ -12,20 +12,15 @@ with builtins;
stdenv.mkDerivation rec {
pname = "libbpf";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
rev = "v${version}";
sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ=";
sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4=";
};
patches = [(fetchpatch {
url = "https://github.com/libbpf/libbpf/pull/41.diff";
sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA=";
})];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libelf zlib ];
@ -38,7 +33,7 @@ stdenv.mkDerivation rec {
postInstall = ''
# install linux's libbpf-compatible linux/btf.h
install -Dm444 include/uapi/linux/btf.h -t $out/include/linux
install -Dm444 include/uapi/linux/*.h -t $out/include/linux
'';
# FIXME: Multi-output requires some fixes to the way the pkg-config file is

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -19,10 +19,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "510.47.03";
sha256_64bit = "8qQh2ug2MY08DZZFnMs68n6Q5QyVsPqkKIr3Ynnl1pA=";
settingsSha256 = "lQRh8dG4NW2vLe4R6xx42BzAu3R6iLyrk3GOGKLfufQ=";
persistencedSha256 = "I8pIdBhbX9rfyhjQHGD5zjCwLF2zl2jc1Id+CTbSHKc=";
version = "510.54";
sha256_64bit = "TCDezK4/40et/Q5piaMG+QJP2t+DGtwejmCFVnUzUWE=";
settingsSha256 = "ZWz5UN6Pa69NlmerKu30G+X8WfGlAwnVerDrO7TRO6w=";
persistencedSha256 = "MgWrBjKXJeRqF+ouT72tTiLPtn+lsS/Cp3oS61AWV8Q=";
}
else legacy_390;

6
pkgs/servers/mautrix-whatsapp/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8=";
sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE=";
vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ=";
doCheck = false;

6
pkgs/tools/networking/oapi-codegen/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oapi-codegen";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "deepmap";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pGkTCOQ2OR/9c5+L9UgESJjSMmz9FjfJw9NB8Nr6gRQ=";
sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q=";
};
vendorSha256 = "sha256-hvY64cmfvEeHniscD1WDyaeFpWeBJwsDNwr76e9F6ow=";
vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw=";
# Tests use network
doCheck = false;

6
pkgs/tools/virtualization/shipyard/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "shipyard";
version = "0.3.30";
version = "0.3.44";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
repo = pname;
sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE=";
sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o=";
};
vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg=";
vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ=";
ldflags = [
"-s" "-w" "-X main.version=${version}"

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

@ -9394,6 +9394,10 @@ with pkgs;
rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {};
rnote = callPackage ../applications/graphics/rnote {
inherit (gst_all_1) gstreamer;
};
rnp = callPackage ../tools/security/rnp { };
rnv = callPackage ../tools/text/xml/rnv { };
@ -9760,6 +9764,10 @@ with pkgs;
sixpair = callPackage ../tools/misc/sixpair {};
sketchybar = callPackage ../os-specific/darwin/sketchybar {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight;
};
skippy-xd = callPackage ../tools/X11/skippy-xd {};
sks = callPackage ../servers/sks { };
@ -20413,7 +20421,7 @@ 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 { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };

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

@ -148,6 +148,8 @@ impure-cmds // appleSourcePackages // chooseLibs // {
lsusb = callPackage ../os-specific/darwin/lsusb { };
moltenvk = callPackage ../os-specific/darwin/moltenvk { };
opencflite = callPackage ../os-specific/darwin/opencflite { };
stubs = pkgs.callPackages ../os-specific/darwin/stubs { };

8
pkgs/top-level/perl-packages.nix
View file

@ -16715,12 +16715,12 @@ let
NetSSLeay = buildPerlPackage {
pname = "Net-SSLeay";
version = "1.88";
version = "1.92";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz";
sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010";
url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz";
sha256 = "sha256-R8LyswDy5xYtcdaZ9jPdajWwYloAy9qMUKwBFEqTlqk=";
};
buildInputs = [ pkgs.openssl ];
buildInputs = [ pkgs.openssl pkgs.zlib ];
doCheck = false; # Test performs network access.
preConfigure = ''
mkdir openssl