mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
8674a36b01
@ -1,10 +1,14 @@
|
||||
{ config, lib, pkgs, extendModules, noUserModules, ... }:
|
||||
{ config, lib, extendModules, noUserModules, ... }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
attrNames
|
||||
concatStringsSep
|
||||
filter
|
||||
length
|
||||
mapAttrs
|
||||
mapAttrsToList
|
||||
match
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
@ -73,6 +77,19 @@ in
|
||||
};
|
||||
|
||||
config = {
|
||||
assertions = [(
|
||||
let
|
||||
invalidNames = filter (name: match "[[:alnum:]_]+" name == null) (attrNames config.specialisation);
|
||||
in
|
||||
{
|
||||
assertion = length invalidNames == 0;
|
||||
message = ''
|
||||
Specialisation names can only contain alphanumeric characters and underscores
|
||||
Invalid specialisation names: ${concatStringsSep ", " invalidNames}
|
||||
'';
|
||||
}
|
||||
)];
|
||||
|
||||
system.systemBuilderCommands = ''
|
||||
mkdir $out/specialisation
|
||||
${concatStringsSep "\n"
|
||||
|
||||
@ -65,7 +65,7 @@ class Entry:
|
||||
# Matching nixos*-generation-$number*.conf
|
||||
rex_generation = re.compile(r"^nixos.*-generation-([0-9]+).*\.conf$")
|
||||
# Matching nixos*-generation-$number-specialisation-$specialisation_name*.conf
|
||||
rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9]+).*\.conf$")
|
||||
rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9_]+).*\.conf$")
|
||||
profile = rex_profile.sub(r"\1", filename) if rex_profile.match(filename) else None
|
||||
specialisation = rex_specialisation.sub(r"\2", filename) if rex_specialisation.match(filename) else None
|
||||
try:
|
||||
|
||||
@ -71,6 +71,32 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
}
|
||||
'';
|
||||
|
||||
wrongConfigFile = pkgs.writeText "configuration.nix" ''
|
||||
{ lib, pkgs, ... }: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
|
||||
];
|
||||
|
||||
boot.loader.grub = {
|
||||
enable = true;
|
||||
device = "/dev/vda";
|
||||
forceInstall = true;
|
||||
};
|
||||
|
||||
documentation.enable = false;
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.writeShellScriptBin "parent" "")
|
||||
];
|
||||
|
||||
specialisation.foo-bar = {
|
||||
inheritParentConfig = true;
|
||||
|
||||
configuration = { ... }: { };
|
||||
};
|
||||
}
|
||||
'';
|
||||
in
|
||||
''
|
||||
machine.start()
|
||||
@ -116,5 +142,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
with subtest("Make sure nonsense command combinations are forbidden"):
|
||||
machine.fail("nixos-rebuild boot --specialisation foo")
|
||||
machine.fail("nixos-rebuild boot -c foo")
|
||||
|
||||
machine.copy_from_host(
|
||||
"${wrongConfigFile}",
|
||||
"/etc/nixos/configuration.nix",
|
||||
)
|
||||
with subtest("Make sure that invalid specialisation names are rejected"):
|
||||
machine.fail("nixos-rebuild switch")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1625,8 +1625,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.23.0";
|
||||
hash = "sha256-eqS/xYK7yh7MvPAl61o1ZJ9wH9amqngJupU+puDq9xs=";
|
||||
version = "0.23.1";
|
||||
hash = "sha256-rwpaixQbuxVkH4wlKPG4Qk69IylwjfCtyfUcqCuN/e8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
||||
@ -37,13 +37,13 @@ let
|
||||
in
|
||||
buildPerlModule rec {
|
||||
pname = "pipe-viewer";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = "pipe-viewer";
|
||||
rev = version;
|
||||
hash = "sha256-GTmva1pDG1g2wZoS3ABYxhWdbARdlcS0rxGjkdJL7js=";
|
||||
hash = "sha256-TCcAQjz0B3eWILMAoqHCnMLvu8zD0W5wOFg+UaMPmXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, glibcLocales
|
||||
, python
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
# Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; };
|
||||
, plugins ? p: [ ]
|
||||
@ -29,6 +30,15 @@ python.pkgs.buildPythonPackage {
|
||||
hash = "sha256-+RCg2XZv0AJnexi7vnQhEXB1qSoKBN1yKWm3etdys1s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with Python 3.12
|
||||
# https://github.com/tobi-wan-kenobi/bumblebee-status/pull/1019
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tobi-wan-kenobi/bumblebee-status/commit/2fe8f1ff1444daf155b18318005f33a76a5d64b4.patch";
|
||||
hash = "sha256-BC1cgQDMJkhuEgq8NJ28521CHbEfqIMueHkFXXlZz2w=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins;
|
||||
propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins;
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "4.5.0";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zLKQbw9d20KKuK5j9RhZPLSDRrw5SQ8vycIEfRmUEzI=";
|
||||
hash = "sha256-lOJN4wSxE3VX/Pb8Aa+ex6hkiPieFelmtn84+SmzOxE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY=";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ autoSignDarwinBinariesHook
|
||||
, buildDotnetModule
|
||||
{ buildDotnetModule
|
||||
, darwin
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
@ -114,7 +114,7 @@ buildDotnetModule rec {
|
||||
which
|
||||
git
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
];
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "15.2.7";
|
||||
version = "15.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V7NJ8UWORo+APCVJmC6l6uQUazLrG94O9V4yC3McBp4=";
|
||||
hash = "sha256-N1mPtF23YP1yeVNUPIxCAFK3ozOCMKV3ZTt+axIWFmQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9Twg9jppFkp0cpxJfBVmWRMwKsXnJ+tUBH8qMYAm1cY=";
|
||||
npmDepsHash = "sha256-ivlbaTCvVbs7k4zpP7fFbMdWuO5rOcT/5451PQh2CKs=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-klcS4SNMB5bAy4Gzk9NgbjbZL+7kh0lNXwIwJoXBbVU=";
|
||||
hash = "sha256-qCIA+VN7mSfeLwN+O2wm0CYDQMCUQzZrj5RxpDEEKQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" ];
|
||||
|
||||
cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA=";
|
||||
cargoHash = "sha256-exLXowD2QTW4IZHIO3PDv6cf0O0deNPuqrCIcTnnJQA=";
|
||||
|
||||
# maa-cli would only seach libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita-orange";
|
||||
version = "20.3";
|
||||
version = "20.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-RT7+LmauSAavl4ZA9vuKNrh/x8cGUb9V4RecxI/fN+E=";
|
||||
hash = "sha256-DdtFAUoIT51kGrEz1IpLvuJMEL+pMDICobuNV6UfC6Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvas-scanner";
|
||||
version = "23.8.2";
|
||||
version = "23.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "openvas-scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sHu6GF+T5Ce2aiGccv9uM+KdAWCLB8CCXujxgxhg4Ho=";
|
||||
hash = "sha256-Bxna9ylQ9MZf/YWLIVI61tRjU5H4Ipqkiz+z21qiaGg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.13.0";
|
||||
version = "3.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-KWVbEtT3uluvLqbRk4tLPA7tGn9gf+Ee5hBrzlWtuhg=";
|
||||
hash = "sha256-6rt40cQde6ck0Eq3YRfN+l2QP18CHTxFj2EJyiPgkrE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-en2vaHI+fE4Jrh91EtFyWRBr+k6KVPanwiOXkZBi3Ts=";
|
||||
hash = "sha256-Xaj4FPveqiivud6Hi/LlRkM9/8jrvX6IDirO/laad5U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
packaging,
|
||||
pandas,
|
||||
passlib,
|
||||
setuptools,
|
||||
peft,
|
||||
pgmpy,
|
||||
plotly,
|
||||
@ -47,11 +48,10 @@
|
||||
scikit-learn,
|
||||
sentence-transformers,
|
||||
seqeval,
|
||||
setuptools,
|
||||
smart-open,
|
||||
snorkel,
|
||||
spacy,
|
||||
spacy-transformers,
|
||||
spacy,
|
||||
sqlalchemy,
|
||||
tqdm,
|
||||
transformers,
|
||||
@ -67,7 +67,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "argilla";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -76,9 +76,11 @@ buildPythonPackage rec {
|
||||
owner = "argilla-io";
|
||||
repo = "argilla";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+eQNvLDV063JY6CyngpGyo4NdSd6HvAHFgGWtPfZNVQ=";
|
||||
hash = "sha256-ndendXlgACFdwnZ/P2W22Tr/Ji8AYw/6jtb8F3/zqSA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"httpx"
|
||||
"numpy"
|
||||
@ -89,7 +91,6 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
|
||||
dependencies = [
|
||||
httpx
|
||||
deprecated
|
||||
|
||||
39
pkgs/development/python-modules/cxxheaderparser/default.nix
Normal file
39
pkgs/development/python-modules/cxxheaderparser/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
pcpp,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cxxheaderparser";
|
||||
version = "1.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robotpy";
|
||||
repo = "cxxheaderparser";
|
||||
rev = version;
|
||||
hash = "sha256-dc+MsSJFeRho6DG21QQZSAq4PmRZl7OlWhIQNisicZo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# version.py is generated based on latest git tag
|
||||
echo "__version__ = '${version}'" > cxxheaderparser/version.py
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
checkInputs = [ pcpp ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "cxxheaderparser" ];
|
||||
|
||||
meta = {
|
||||
description = "Modern pure python C++ header parser";
|
||||
homepage = "https://github.com/robotpy/cxxheaderparser";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ nim65s ];
|
||||
};
|
||||
}
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "dask-expr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JLOTmpaKDyv4dgEM/dQFeQrD0OZcwNxBi7/pq/STJYY=";
|
||||
hash = "sha256-z/+0d/mcC51rXfSCkVosc2iJ9SKHuKlPO+n/+SisQBg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "moonraker-api";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cmroche";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AwSHF9BbxKBXIQdG4OX1vYYP/ST4jSz3uMMDUx0MSEg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.14.5";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "postlund";
|
||||
repo = "pyatv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw=";
|
||||
hash = "sha256-59XDh+TA4UYzfLJtbTiMC6Wz7EvUW22ONM4JQw5t/5o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -35,14 +35,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtile";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FO83i6nnMGY4eGsPYFfLuQPbN9ngUWXQMguBYqGrehg=";
|
||||
hash = "sha256-cAzVQaw8rnitr6LJBQYEmnGWQ+1ATaqBdTbOaZbGewo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch2,
|
||||
|
||||
# build-system
|
||||
flit-core,
|
||||
@ -27,6 +28,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-QTLSEjdJtDH4GCamnKHN5pEjW41rRtAMXxyZZMM5K3w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with python 3.12
|
||||
# https://github.com/florisla/stm32loader/pull/79
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/florisla/stm32loader/commit/96f59b2984b0d0371b2da0360d6e8d94d0b39a68.patch?full_index=1";
|
||||
hash = "sha256-JUEjQWOnzeMA1OELS214OR7+MYUkCKN5lxwsmRoFbfo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e49fac2..25e3302 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -34,6 +34,14 @@ option(ENABLE_GLIBC_WORKAROUND "Workaround GLIBC symbol exports" OFF)
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
+IF(APPLE)
|
||||
+ set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||
+ set(CMAKE_HAVE_THREADS_LIBRARY 1)
|
||||
+ set(CMAKE_USE_WIN32_THREADS_INIT 0)
|
||||
+ set(CMAKE_USE_PTHREADS_INIT 1)
|
||||
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
+ENDIF()
|
||||
+
|
||||
if(ENABLE_MASON)
|
||||
# versions in use
|
||||
set(MASON_BOOST_VERSION "1.65.1")
|
||||
@@ -405,7 +413,8 @@ endif()
|
||||
if(APPLE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
|
||||
execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+ execute_process(COMMAND uname -m OUTPUT_VARIABLE JAMBA_OSX_NATIVE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
- set(CMAKE_OSX_ARCHITECTURES "x86_64")
|
||||
+ set(CMAKE_OSX_ARCHITECTURES "${JAMBA_OSX_NATIVE_ARCHITECTURE}")
|
||||
+ message(STATUS "Set Architecture to ${JAMBA_OSX_NATIVE_ARCHITECTURE} on OS X")
|
||||
- message(STATUS "Set Architecture to x64 on OS X")
|
||||
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
|
||||
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
|
||||
@ -1,19 +1,47 @@
|
||||
{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, bzip2, libxml2, libzip, boost179, lua, luabind, tbb, expat}:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
libxml2,
|
||||
libzip,
|
||||
boost,
|
||||
lua,
|
||||
luabind,
|
||||
tbb,
|
||||
expat,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osrm-backend";
|
||||
version = "5.26.0";
|
||||
version = "5.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Project-OSRM";
|
||||
repo = "osrm-backend";
|
||||
owner = "Project-OSRM";
|
||||
repo = "osrm-backend";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kqRYE26aeq7nCen56TJo3BlyLFWn4NMltsq+re64/VQ=";
|
||||
sha256 = "sha256-3oA/U5O4GLfwMF7x99JQuFK7ewDrLJLh6BBLYfnyNaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ bzip2 libxml2 libzip boost179 lua luabind tbb expat ];
|
||||
buildInputs = [
|
||||
bzip2
|
||||
libxml2
|
||||
libzip
|
||||
boost
|
||||
lua
|
||||
luabind
|
||||
tbb
|
||||
expat
|
||||
];
|
||||
|
||||
patches = [
|
||||
# gcc-13 build fix:
|
||||
@ -23,8 +51,6 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/Project-OSRM/osrm-backend/commit/af59a9cfaee4d601b5c88391624a05f2a38da17b.patch";
|
||||
hash = "sha256-dB9JP/DrJXpFGLD/paein2z64UtHIYZ17ycb91XWpEI=";
|
||||
})
|
||||
|
||||
./darwin.patch
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
@ -35,13 +61,21 @@ stdenv.mkDerivation rec {
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/osrm-backend
|
||||
cp -r ../profiles $out/share/osrm-backend/profiles
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) osrm-backend;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Project-OSRM/osrm-backend/wiki";
|
||||
description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
|
||||
changelog = "https://github.com/Project-OSRM/osrm-backend/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers;[ erictapen ];
|
||||
maintainers = with lib.maintainers; [ erictapen ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
2
pkgs/servers/rustdesk-server/Cargo.lock
generated
2
pkgs/servers/rustdesk-server/Cargo.lock
generated
@ -779,7 +779,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hbbs"
|
||||
version = "1.1.11"
|
||||
version = "1.1.11-1"
|
||||
dependencies = [
|
||||
"async-speed-limit",
|
||||
"async-trait",
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustdesk-server";
|
||||
version = "1.1.11";
|
||||
version = "1.1.11-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustdesk";
|
||||
repo = "rustdesk-server";
|
||||
rev = version;
|
||||
hash = "sha256-wGV7Fsil26qs0BYI8G5pVJDvJvNIyrd/yaIJaGAodpw=";
|
||||
hash = "sha256-dAw1xKyZovPkz1qw58QymIvv7ABhmHs2lFx/H6g7GgI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rqlite";
|
||||
version = "8.26.8";
|
||||
version = "8.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rqlite";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1mwrI3OAhkk7VSNxy47g5xt5PcWiHUCSjFw9UtDeqTM=";
|
||||
sha256 = "sha256-FhoD88j+uG1AvZ4ce1hwHCFH0cxvlsljf2iv7zAiXLQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Hxo5pFz8IGvHoB5N2S6VOWVu4U/Fwit1x1WpbckKCeU=";
|
||||
vendorHash = "sha256-WQSdRPU8T02HdKTivLrvdd81XMhqFms0SA0zohicsjA=";
|
||||
|
||||
subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ];
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hishtory";
|
||||
version = "0.302";
|
||||
version = "0.303";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddworken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hqOAHjYYfK74Zvlgyo3i6ljIsvE75+oJccSfCfkS8K4=";
|
||||
hash = "sha256-uhORdve07JARKT/BD0VLK6XnN4nehXODswczrALK0MQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5O2UXpQEs/LCnFnP7g+JYifbSeHjzbnoX9KuIKbqVdE=";
|
||||
vendorHash = "sha256-qQIyeqNF8unmpJG4+kekF2KDQjcpFanJp7siX+jWRwQ=";
|
||||
|
||||
ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ];
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4ltABwLWP/KfJ+xApshVz+U4tbAlXf0SLrK84xe76zo=";
|
||||
hash = "sha256-Gsyobjo5LPoTnvy76Absa0xog/iMzbz40PS4AOycRos=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z7O0IAXGCXV63WjaRG+7c7q/rlqkV12XWNLhsduvk6s=";
|
||||
|
||||
@ -9,16 +9,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "vaultwarden";
|
||||
rev = version;
|
||||
hash = "sha256-fQjTSLPJQk1byjX+HADtQvQRqEaEiCmWjgA1WIMLBu4=";
|
||||
hash = "sha256-y8+hkvUKj0leJJ5w72HOVDSOtKW6y2Y44VfOZSetn4M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VWKkZvuv+B9V6pgxZRGlLIRUdLEh61RpOfEnOtEBKU0=";
|
||||
cargoHash = "sha256-1Z0ba1FhxQ5qVpofi0XD1MYz02QCvdXGeuViW3lU6JQ=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = version;
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024.5.1b";
|
||||
version = "2024.6.2b";
|
||||
|
||||
bw_web_builds = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "bw_web_builds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5nlFt05ari9ovl+CaoyR/X9BzhsmsGyDt6eGLJ5ae/4=";
|
||||
hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8=";
|
||||
};
|
||||
|
||||
in buildNpmPackage rec {
|
||||
@ -25,10 +25,10 @@ in buildNpmPackage rec {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "web-v${lib.removeSuffix "b" version}";
|
||||
hash = "sha256-U/lAt2HfoHGMu6mOki/4+ljhU9FwkodvFBr5zcDO8Wk=";
|
||||
hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ui00afmnu77CTT9gh6asc4uT7AhVIuiD60sq/1f9viA=";
|
||||
npmDepsHash = "sha256-zMzQEM5mV14gewzYhy1F2bNEugXjZSOviYwYVV2Cb8c=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${bw_web_builds}/{patches,resources} ..
|
||||
|
||||
@ -8136,10 +8136,6 @@ with pkgs;
|
||||
|
||||
github-backup = callPackage ../tools/misc/github-backup { };
|
||||
|
||||
github-runner = callPackage ../development/tools/continuous-integration/github-runner {
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
gitkraken = callPackage ../applications/version-management/gitkraken { };
|
||||
|
||||
gitlab = callPackage ../applications/version-management/gitlab { };
|
||||
@ -25448,7 +25444,11 @@ with pkgs;
|
||||
|
||||
openxr-loader = callPackage ../development/libraries/openxr-loader { };
|
||||
|
||||
osrm-backend = callPackage ../servers/osrm-backend { };
|
||||
osrm-backend = callPackage ../servers/osrm-backend {
|
||||
tbb = tbb_2021_11;
|
||||
# https://github.com/Project-OSRM/osrm-backend/issues/6503
|
||||
boost = boost179;
|
||||
};
|
||||
|
||||
oven-media-engine = callPackage ../servers/misc/oven-media-engine { };
|
||||
|
||||
|
||||
@ -2741,6 +2741,8 @@ self: super: with self; {
|
||||
|
||||
cxxfilt = callPackage ../development/python-modules/cxxfilt { };
|
||||
|
||||
cxxheaderparser = callPackage ../development/python-modules/cxxheaderparser { };
|
||||
|
||||
cycler = callPackage ../development/python-modules/cycler { };
|
||||
|
||||
cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user