mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3c2967ad03
|
|
@ -55,13 +55,19 @@ sets are
|
|||
* `pkgs.python311Packages`
|
||||
* `pkgs.python312Packages`
|
||||
* `pkgs.python313Packages`
|
||||
* `pkgs.pypyPackages`
|
||||
* `pkgs.pypy27Packages`
|
||||
* `pkgs.pypy39Packages`
|
||||
* `pkgs.pypy310Packages`
|
||||
|
||||
and the aliases
|
||||
|
||||
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
|
||||
* `pkgs.python3Packages` pointing to `pkgs.python311Packages`
|
||||
* `pkgs.python3Packages` pointing to `pkgs.python312Packages`
|
||||
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
|
||||
* `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages`
|
||||
* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages`
|
||||
* `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages`
|
||||
|
||||
|
||||
#### `buildPythonPackage` function {#buildpythonpackage-function}
|
||||
|
||||
|
|
@ -1364,6 +1370,10 @@ those specified in `build-system`. If a package requires incompatible build
|
|||
time dependencies, they should be removed in `postPatch` through
|
||||
`substituteInPlace` or similar.
|
||||
|
||||
For ease of use, both `buildPythonPackage` and `buildPythonApplication` will
|
||||
automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or
|
||||
`pythonRemoveDeps` is specified.
|
||||
|
||||
#### Using unittestCheckHook {#using-unittestcheckhook}
|
||||
|
||||
`unittestCheckHook` is a hook which will set up (or configure) a [`checkPhase`](#ssec-check-phase) to run `python -m unittest discover`:
|
||||
|
|
|
|||
|
|
@ -16345,6 +16345,11 @@
|
|||
githubId = 4201956;
|
||||
name = "pongo1231";
|
||||
};
|
||||
PopeRigby = {
|
||||
name = "PopeRigby";
|
||||
github = "poperigby";
|
||||
githubId = 20866468;
|
||||
};
|
||||
poptart = {
|
||||
email = "poptart@hosakacorp.net";
|
||||
github = "terrorbyte";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ let
|
|||
rec {
|
||||
x86_64-linux = {
|
||||
urlSuffix = "linux-x86_64.tar.gz";
|
||||
hash = "sha256-PVlHPjr6aUkTp9x4MVC8cgebmdaUQXX6eV0/LfAmiJc=";
|
||||
hash = "sha256-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
urlSuffix = "macos-universal.zip";
|
||||
hash = "sha256-gx+iMo2611uoR549gpBoHlp2h6zQtugPZnU9qbH6VIQ=";
|
||||
hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4=";
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ let
|
|||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "appflowy";
|
||||
version = "0.6.4";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ let
|
|||
abseil-cpp = fetchFromGitHub {
|
||||
owner = "abseil";
|
||||
repo = "abseil-cpp";
|
||||
rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a";
|
||||
hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
|
||||
rev = "4447c7562e3bc702ade25105912dce503f0c4010";
|
||||
hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=";
|
||||
};
|
||||
benchmark = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "e45585a4b8e75c28479fa4107182c28172799640";
|
||||
hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY=";
|
||||
rev = "7c8ed6b082aa3c7a3402f18e50da4480421d08fd";
|
||||
hash = "sha256-xX3o4wX7RUvw1x2gOlT6sGhutDYLBZ/JzFnv68qN6E8=";
|
||||
};
|
||||
ccd = fetchFromGitHub {
|
||||
owner = "danfis";
|
||||
|
|
@ -40,8 +40,8 @@ let
|
|||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
rev = "f8d7d77c06936315286eb55f8de22cd23c188571";
|
||||
hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U=";
|
||||
rev = "b514bdc898e2951020cbdca1304b75f5950d1f59";
|
||||
hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
|
||||
};
|
||||
lodepng = fetchFromGitHub {
|
||||
owner = "lvandeve";
|
||||
|
|
@ -129,7 +129,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mujoco";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
# Bumping version? Make sure to look though the MuJoCo's commit
|
||||
# history for bumped dependency pins!
|
||||
|
|
@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "google-deepmind";
|
||||
repo = "mujoco";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BCvWVOpViEhwvlBzXuj0hoN6W4z5vC8MeO91SsdQ+x4=";
|
||||
hash = "sha256-Il1ZZdHXsBcamIILfae8n51W8wJ78a/H3gQx2/+n9kQ=";
|
||||
};
|
||||
|
||||
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@
|
|||
};
|
||||
aks-preview = mkAzExtension rec {
|
||||
pname = "aks-preview";
|
||||
version = "7.0.0b2";
|
||||
version = "7.0.0b3";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "f2f8aba2abf4252b3e77c2d4245320c025e111d5374bb6c1a57631cd72c42e39";
|
||||
sha256 = "04067e9050de7b3560030613232bf51d9ada4b91885285954afe77b3e40ad90a";
|
||||
description = "Provides a preview for upcoming AKS features";
|
||||
};
|
||||
akshybrid = mkAzExtension rec {
|
||||
|
|
@ -227,9 +227,9 @@
|
|||
};
|
||||
connectedmachine = mkAzExtension rec {
|
||||
pname = "connectedmachine";
|
||||
version = "1.0.0b1";
|
||||
version = "1.0.0b2";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl";
|
||||
sha256 = "f829b171bc489bd1bffea518040acc74608581dae798f4b23bedfe8bf7445383";
|
||||
sha256 = "8b8c4340c4c6552e3826220ffb95bf619447675b0469304b71fa80e2e4e31c81";
|
||||
description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension";
|
||||
};
|
||||
connectedvmware = mkAzExtension rec {
|
||||
|
|
@ -514,9 +514,9 @@
|
|||
};
|
||||
hdinsightonaks = mkAzExtension rec {
|
||||
pname = "hdinsightonaks";
|
||||
version = "1.0.0b2";
|
||||
version = "1.0.0b3";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl";
|
||||
sha256 = "c323291952f9ec6014af5f760b26860bd8029aa04cc226fd5996f20726641c59";
|
||||
sha256 = "f549b85107b7b83ff64fcfa5c90a5d7e900a5ea2efe76eec9b1f81689e58c365";
|
||||
description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension";
|
||||
};
|
||||
healthbot = mkAzExtension rec {
|
||||
|
|
@ -864,9 +864,9 @@
|
|||
};
|
||||
scvmm = mkAzExtension rec {
|
||||
pname = "scvmm";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "565aa9d75dd4d276df2f8ffec5311bd2ae16a2d6172d525a7763fc5972b262b7";
|
||||
sha256 = "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68";
|
||||
description = "Microsoft Azure Command-Line Tools SCVMM Extension";
|
||||
};
|
||||
self-help = mkAzExtension rec {
|
||||
|
|
@ -913,9 +913,9 @@
|
|||
};
|
||||
stack-hci-vm = mkAzExtension rec {
|
||||
pname = "stack-hci-vm";
|
||||
version = "1.1.16";
|
||||
version = "1.1.20";
|
||||
url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl";
|
||||
sha256 = "6b08c750b3c3898aab17c459ff626210c17ad12f960f2ab89204765a17d530da";
|
||||
sha256 = "7de544b8058ab11d9713b551db65aeaec6b8e5832cdadbbf26ccb7a4a282db6b";
|
||||
description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension";
|
||||
};
|
||||
standbypool = mkAzExtension rec {
|
||||
|
|
@ -1023,18 +1023,11 @@
|
|||
sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d";
|
||||
description = "Manage virtual WAN, hubs, VPN gateways and VPN sites";
|
||||
};
|
||||
vm-repair = mkAzExtension rec {
|
||||
pname = "vm-repair";
|
||||
version = "1.0.7";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "989b15053fe19f1dbb37fd4a31720e2a1ca622ecadaaa4b5c568c44e44c20fa6";
|
||||
description = "Auto repair commands to fix VMs";
|
||||
};
|
||||
vmware = mkAzExtension rec {
|
||||
pname = "vmware";
|
||||
version = "6.0.1";
|
||||
version = "7.0.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "2e07a4ddf1b244cfe8b63a29b7f82c3ec94294f10bacfe8fd604841d290020b5";
|
||||
sha256 = "e0fadce4fc02996443a8e1673d19ebd24383c584ca89bd396ce963e85865ac0d";
|
||||
description = "Azure VMware Solution commands";
|
||||
};
|
||||
webapp = mkAzExtension rec {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
mkAzExtension,
|
||||
mycli,
|
||||
python3Packages,
|
||||
python3,
|
||||
}:
|
||||
|
||||
{
|
||||
|
|
@ -17,9 +16,7 @@
|
|||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl";
|
||||
sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee";
|
||||
description = "Support for managing Application Insights components and querying metrics, events, and logs from such components";
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
isodate
|
||||
];
|
||||
propagatedBuildInputs = with python3Packages; [ isodate ];
|
||||
meta.maintainers = with lib.maintainers; [ andreasvoss ];
|
||||
};
|
||||
|
||||
|
|
@ -59,10 +56,11 @@
|
|||
pymysql
|
||||
setproctitle
|
||||
])
|
||||
++ [ (mycli.override { inherit python3; }) ];
|
||||
++ [ mycli ];
|
||||
meta.maintainers = with lib.maintainers; [ obreitwi ];
|
||||
};
|
||||
|
||||
# Removed extensions
|
||||
blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26
|
||||
vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
fetchFromGitHub,
|
||||
runCommand,
|
||||
installShellFiles,
|
||||
python311,
|
||||
python3,
|
||||
writeScriptBin,
|
||||
|
||||
# Whether to include patches that enable placing certain behavior-defining
|
||||
|
|
@ -21,21 +21,16 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.62.0";
|
||||
version = "2.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
hash = "sha256-Rb27KRAb50YzTZzMs6n8g04x14ni3rIYAL3c5j/ieRw=";
|
||||
hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs=";
|
||||
};
|
||||
|
||||
# Pin Python version to 3.11.
|
||||
# See https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/53
|
||||
# and https://github.com/Azure/azure-cli/issues/27673
|
||||
python3 = python311;
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
py = callPackage ./python-packages.nix { inherit src version python3; };
|
||||
|
||||
|
|
@ -74,7 +69,7 @@ let
|
|||
extensions =
|
||||
callPackages ./extensions-generated.nix { inherit mkAzExtension; }
|
||||
// callPackages ./extensions-manual.nix {
|
||||
inherit mkAzExtension python3;
|
||||
inherit mkAzExtension;
|
||||
python3Packages = python3.pkgs;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
src,
|
||||
version,
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2024-07-24";
|
||||
version = "0-unstable-2024-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "304a011325b7ac7b8c9950333cd215a7aa146b0e";
|
||||
hash = "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=";
|
||||
rev = "afc892db74d65042031a093adb6010c4c3378422";
|
||||
hash = "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -81,9 +81,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
] ++ (with python.pkgs; [
|
||||
];
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
setuptools
|
||||
]);
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"celery"
|
||||
|
|
@ -105,7 +107,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"whitenoise"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
dependencies = with python.pkgs; [
|
||||
beautifulsoup4
|
||||
bleach
|
||||
celery
|
||||
|
|
@ -141,9 +143,12 @@ python.pkgs.buildPythonApplication rec {
|
|||
vobject
|
||||
whitenoise
|
||||
zxcvbn
|
||||
] ++ beautifulsoup4.optional-dependencies.lxml ++ plugins;
|
||||
]
|
||||
++ beautifulsoup4.optional-dependencies.lxml
|
||||
++ django.optional-dependencies.argon2
|
||||
++ plugins;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
mysql = with python.pkgs; [
|
||||
mysqlclient
|
||||
];
|
||||
|
|
@ -196,7 +201,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
pytest-xdist
|
||||
pytestCheckHook
|
||||
responses
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
disabledTests = [
|
||||
# tries to run npm run i18n:extract
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskwarrior";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "v3.0.2";
|
||||
hash = "sha256-vN3X6vLuD4Fw9wpEUYLf8sboA5GIcdP5EFb41KS6d5s=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iKpOExj1xM9rU/rIcOLLKMrZrAfz7y9X2kt2CjfMOOQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -45,16 +45,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
patchShebangs --build test
|
||||
'';
|
||||
checkTarget = "test";
|
||||
checkTarget = "build_tests";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}-cargo-deps";
|
||||
inherit src;
|
||||
sourceRoot = src.name;
|
||||
hash = "sha256-4hdM9LgDa47ZYcX30HXvixIRy0xaahG4XBqPiUM+IUM=";
|
||||
hash = "sha256-L+hYYKXSOG4XYdexLMG3wdA7st+A9Wk9muzipSNjxrA=";
|
||||
};
|
||||
cargoRoot = "./";
|
||||
preConfigure = ''
|
||||
|
|
|
|||
35
pkgs/by-name/te/termsvg/package.nix
Normal file
35
pkgs/by-name/te/termsvg/package.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "termsvg";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrmarble";
|
||||
repo = "termsvg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q6xjsoxQTIQwPYkBTGwLfTt1VQ8GJPdsiP5dvTyEBIw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HhJcf+NwM1h0Hh76LU/cddaLoCaQdyuKLSvDFmiKEEg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.commit=${src.rev}"
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Record, share and export your terminal as a animated SVG image";
|
||||
homepage = "https://github.com/mrmarble/termsvg";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
mainProgram = "termsvg";
|
||||
};
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeCheckInputs = [ util-linuxMinimal which ];
|
||||
doCheck = true;
|
||||
doCheck = !(stdenv.targetPlatform.useLLVM or false);
|
||||
|
||||
# Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.
|
||||
preFixup = "rm -rfv src";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }:
|
||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
|
|
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE=";
|
||||
};
|
||||
|
||||
patches = lib.optional (stdenv.targetPlatform.useLLVM or false) (fetchpatch {
|
||||
url = "https://github.com/libunwind/libunwind/pull/770/commits/a69d0f14c9e6c46e82ba6e02fcdedb2eb63b7f7f.patch";
|
||||
hash = "sha256-9oBZimCXonNN++jJs3emp9w+q1aj3eNzvSKPgh92itA=";
|
||||
});
|
||||
|
||||
postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then ''
|
||||
substituteInPlace configure.ac --replace "-lgcc_s" ""
|
||||
'' else lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ stdenv.mkDerivation {
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
propagatedBuildInputs = [ libogg ];
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "10.5.4";
|
||||
version = "10.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "Clarifai";
|
||||
repo = "clarifai-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C/ZmU1RRV4gJsgTgBGnhsJ7JUasHdKgoIro+fpjH4Ss=";
|
||||
hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
# in the project's CI.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-R388jEIbzd60en1SRC8mKSSlvdW/xWl1xDnUET7QvKc=";
|
||||
hash = "sha256-fLo4sQryDNNutDiNqWYHHNwS/bEBg4iQ/jwgyx1+ZsU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OhquE+QhNOXFkKy/TvKlLn65CMchvKjcbR/S4Rl2MT4=";
|
||||
hash = "sha256-eEfKWBwhtDkoAhsLH8P2ybM7aF/d2yREIv7/5RVz0Z8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "redis-om";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "redis";
|
||||
repo = "redis-om-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jwFtRnj/jhH+AKjExdOCgUfgEWweFCXVuz6F3qQRcs0=";
|
||||
hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -1,55 +1,71 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
glslang,
|
||||
pkg-config,
|
||||
flac,
|
||||
libopus,
|
||||
opusfile,
|
||||
makeWrapper,
|
||||
SDL2,
|
||||
gzip,
|
||||
libvorbis,
|
||||
libmad,
|
||||
vulkan-loader,
|
||||
moltenvk,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkquake";
|
||||
version = "1.22.3";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Novum";
|
||||
repo = "vkQuake";
|
||||
rev = version;
|
||||
sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc=";
|
||||
sha256 = "sha256-3xWwqN0EcwDMEhVxfLa0bMMClM+zELEFWzO/EJvPNs0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/Quake";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
vulkan-headers
|
||||
glslang
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gzip
|
||||
SDL2
|
||||
libvorbis
|
||||
flac
|
||||
gzip
|
||||
libmad
|
||||
libopus
|
||||
libvorbis
|
||||
opusfile
|
||||
vulkan-loader
|
||||
] ++ lib.optional stdenv.isDarwin moltenvk;
|
||||
|
||||
buildFlags = [ "DO_USERDIRS=1" ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p "$out/bin"
|
||||
'';
|
||||
|
||||
makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/vkquake \
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp vkquake "$out/bin"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
postFixup = ''
|
||||
patchelf $out/bin/vkquake \
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vulkan Quake port based on QuakeSpasm";
|
||||
mainProgram = "vkquake";
|
||||
homepage = src.meta.homepage;
|
||||
longDescription = ''
|
||||
vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering.
|
||||
|
|
@ -61,6 +77,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ ylh ];
|
||||
maintainers = with maintainers; [ PopeRigby ylh ];
|
||||
mainProgram = "vkquake";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20240330.fd304c5";
|
||||
version = "20240802.1c1899e";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
hash = "sha256-usEgCfbeKOkAg/sHpRxuMcPGHxb+J5+r92aO4Ar7iUA=";
|
||||
hash = "sha256-9y6epjABG6Cs31m3T/8k8OTzOuYnH/gxLFEitRfRwkk=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
|
|
|||
Loading…
Reference in a new issue