Merge master into staging-next
This commit is contained in:
commit
a440592932
42
pkgs/data/icons/simp1e-cursors/default.nix
Normal file
42
pkgs/data/icons/simp1e-cursors/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitLab, python3, librsvg, xcursorgen }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "simp1e-cursors";
|
||||
version = "20221103.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cursors";
|
||||
repo = "simp1e";
|
||||
rev = version;
|
||||
sha256 = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
(python3.withPackages (ps: with ps; [ pillow ]))
|
||||
librsvg
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
patchShebangs ./build.sh ./cursor-generator
|
||||
HOME=$TMP ./build.sh
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -dm 755 $out/share/icons
|
||||
cp -r built_themes/* $out/share/icons/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An aesthetic cursor theme for Linux desktops";
|
||||
homepage = "https://gitlab.com/cursors/simp1e";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ natto1784 ];
|
||||
};
|
||||
}
|
138
pkgs/development/python-modules/python-arango/default.nix
Normal file
138
pkgs/development/python-modules/python-arango/default.nix
Normal file
|
@ -0,0 +1,138 @@
|
|||
{ lib
|
||||
, arangodb
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pyjwt
|
||||
, pytest
|
||||
, mock
|
||||
, requests
|
||||
, requests-toolbelt
|
||||
}:
|
||||
|
||||
let
|
||||
testDBOpts = {
|
||||
host = "127.0.0.1";
|
||||
port = "8529";
|
||||
password = "test";
|
||||
secret = "secret";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-arango";
|
||||
version = "7.5.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArangoDB-Community";
|
||||
repo = "python-arango";
|
||||
rev = version;
|
||||
sha256 = "0qb2yp05z8dmgsyyxqrl3q0a60jaiih96zhxmqrn2yf7as45n07j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
requests-toolbelt
|
||||
pyjwt
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
arangodb
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# arangodb is compiled only for particular target architectures
|
||||
# (i.e. "haswell"). Thus, these tests may not pass reproducibly,
|
||||
# failing with: `166: Illegal instruction` if not run on arangodb's
|
||||
# specified architecture.
|
||||
#
|
||||
# nonetheless, the client library should remain in nixpkgs - since
|
||||
# the client library will talk to arangodb across the network and
|
||||
# architecture issues will be irrelevant.
|
||||
doCheck = false;
|
||||
|
||||
preCheck = lib.optionalString doCheck ''
|
||||
# Start test DB
|
||||
mkdir -p .nix-test/{data,work}
|
||||
|
||||
ICU_DATA=${arangodb}/share/arangodb3 \
|
||||
GLIBCXX_FORCE_NEW=1 \
|
||||
TZ=UTC \
|
||||
TZ_DATA=${arangodb}/share/arangodb3/tzdata \
|
||||
ARANGO_ROOT_PASSWORD=${testDBOpts.password} \
|
||||
${arangodb}/bin/arangod \
|
||||
--server.uid=$(id -u) \
|
||||
--server.gid=$(id -g) \
|
||||
--server.authentication=true \
|
||||
--server.endpoint=http+tcp://${testDBOpts.host}:${testDBOpts.port} \
|
||||
--server.descriptors-minimum=4096 \
|
||||
--server.jwt-secret=${testDBOpts.secret} \
|
||||
--javascript.app-path=.nix-test/app \
|
||||
--log.file=.nix-test/log \
|
||||
--database.directory=.nix-test/data \
|
||||
--foxx.api=false &
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--host"
|
||||
testDBOpts.host
|
||||
"--port"
|
||||
testDBOpts.port
|
||||
"--passwd"
|
||||
testDBOpts.password
|
||||
"--secret"
|
||||
testDBOpts.secret
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError geo-related - try enabling later
|
||||
"test_document_find_in_box"
|
||||
|
||||
# maybe arangod misconfig - try enabling later
|
||||
# arango.exceptions.JWTAuthError: [HTTP 401][ERR 401] Wrong credentials
|
||||
"test_auth_jwt"
|
||||
|
||||
# ValueError - try enabling later
|
||||
# maybe missed 3.9.3->3.10.0 changes
|
||||
# most caused by key change: isNewlyCreated->new
|
||||
"test_add_hash_index"
|
||||
"test_add_skiplist_index"
|
||||
"test_add_persistent_index"
|
||||
"test_add_ttl_index"
|
||||
"test_delete_index"
|
||||
"test_pregel_management"
|
||||
|
||||
# formatting error - try enabling later
|
||||
# maybe missed 3.9.3->3.10.0 changes
|
||||
# caused by: body["computedValues"] = None
|
||||
"test_permission_management"
|
||||
"test_collection_misc_methods"
|
||||
"test_collection_management"
|
||||
"test_replication_inventory"
|
||||
|
||||
# want outgoing network to update foxx apis
|
||||
# so foxx.api disabled in arangod startup
|
||||
"test_foxx_service_management_file"
|
||||
"test_foxx_service_management_json"
|
||||
"test_foxx_config_management"
|
||||
"test_foxx_dependency_management"
|
||||
"test_foxx_development_toggle"
|
||||
"test_foxx_misc_functions"
|
||||
|
||||
# no replication configured via arangod invocation
|
||||
"test_replication_applier"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "arango" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Driver for ArangoDB";
|
||||
homepage = "https://github.com/ArangoDB-Community/python-arango";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jsoo1 ];
|
||||
};
|
||||
}
|
|
@ -4,14 +4,14 @@ let
|
|||
generic = { subPackages, pname, postInstall ? "", mainProgram }:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "6.9.0";
|
||||
version = "6.9.1";
|
||||
shortRev = "3a1ac58"; # for internal version info
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sensu";
|
||||
repo = "sensu-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-H6mpry6uJtMVJmsdLgka7X/IzMP1dbp+hOl3pGVWUAE=";
|
||||
sha256 = "sha256-vw5A5Cg4envrDfLsdauSONgd6rPZSu5wPiPOoNIcS9w=";
|
||||
};
|
||||
|
||||
inherit subPackages postInstall;
|
||||
|
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ferretdb";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wjqTYrAVrUl+i+2glSUW1xS/qjvTqRXYu4s3F5Wi0Sc=";
|
||||
sha256 = "sha256-BjGK1HvAFBs82bDyI6A7QsJcIaEjEKCw3dyiSqaS2tA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > internal/util/version/gen/version.txt
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-wjlGAhut9/jZ2GmKg7XmenphkgxWn0VbuvYEtORpbtw=";
|
||||
vendorSha256 = "sha256-xmUSjkl41jwC/vaUcqZBvLo2wWp8XlXjzzemN5Ja2gg=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
# see https://github.com/mchehab/zbar/issues/104
|
||||
, enableDbus ? false
|
||||
, libintl
|
||||
, libiconv
|
||||
, Foundation
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -50,6 +52,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
imagemagickBig
|
||||
libintl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Foundation
|
||||
] ++ lib.optionals enableDbus [
|
||||
dbus
|
||||
] ++ lib.optionals withXorg [
|
||||
|
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9dp/OMHIA1qYM4XLWOTPmlUm6+7EOE9PFsIa8IcZ/8M=";
|
||||
sha256 = "sha256-ZHDHTHi8NPXlLiLNkXh8k15C0DQ8pRMTo2kXkCbOc2o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TfHBvcG3e+yjifPVo0ZgcvLvD16fni4m71nCr4cCBD4=";
|
||||
|
|
|
@ -13307,6 +13307,7 @@ with pkgs;
|
|||
zbackup = callPackage ../tools/backup/zbackup {};
|
||||
|
||||
zbar = libsForQt5.callPackage ../tools/graphics/zbar {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
|
@ -27001,6 +27002,8 @@ with pkgs;
|
|||
|
||||
sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { };
|
||||
|
||||
simp1e-cursors = callPackage ../data/icons/simp1e-cursors { };
|
||||
|
||||
sjasmplus = callPackage ../development/compilers/sjasmplus { };
|
||||
|
||||
skeu = callPackage ../data/themes/skeu { };
|
||||
|
|
|
@ -8977,6 +8977,8 @@ self: super: with self; {
|
|||
|
||||
python3-openid = callPackage ../development/python-modules/python3-openid { };
|
||||
|
||||
python-arango = callPackage ../development/python-modules/python-arango { };
|
||||
|
||||
python-awair = callPackage ../development/python-modules/python-awair { };
|
||||
|
||||
python3-saml = callPackage ../development/python-modules/python3-saml { };
|
||||
|
|
Loading…
Reference in a new issue