Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e00c88f9d4
nixos
pkgs
applications
editors/emacs/elisp-packages
finance/odoo
misc
networking/mailreaders/notmuch
version-management/git-repo
development
libraries
ocaml-modules/ethernet
python-modules
aws-sam-translator
casbin
dbus-fast
fe25519
getjump
json-tricks
python3-saml
recordlinkage
typecode
servers
tools
graphics/pikchr
networking
security
system/nvitop
text/languagetool-rust
top-level
@ -160,7 +160,7 @@ in
|
||||
root * ${cfg.ui.package}/dist
|
||||
file_server
|
||||
}
|
||||
handle_path /static/undefined/* {
|
||||
handle_path /static/${cfg.ui.package.passthru.commit_sha}/* {
|
||||
root * ${cfg.ui.package}/dist
|
||||
file_server
|
||||
}
|
||||
|
||||
@ -349,6 +349,7 @@ in {
|
||||
invidious = handleTest ./invidious.nix {};
|
||||
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
|
||||
odoo = handleTest ./odoo.nix {};
|
||||
odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; };
|
||||
# 9pnet_virtio used to mount /nix partition doesn't support
|
||||
# hibernation. This test happens to work on x86_64-linux but
|
||||
# not on other platforms.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : {
|
||||
name = "odoo";
|
||||
meta.maintainers = with lib.maintainers; [ mkg20001 ];
|
||||
|
||||
@ -11,6 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
|
||||
services.odoo = {
|
||||
enable = true;
|
||||
package = package;
|
||||
domain = "localhost";
|
||||
};
|
||||
};
|
||||
|
||||
@ -474,6 +474,13 @@ let
|
||||
# part of a larger package
|
||||
notmuch = dontConfigure super.notmuch;
|
||||
|
||||
pikchr-mode = super.pikchr-mode.overrideAttrs (attrs: {
|
||||
postPatch = attrs.postPatch or "" + ''
|
||||
substituteInPlace pikchr-mode.el \
|
||||
--replace '"pikchr")' '"${lib.getExe pkgs.pikchr}")'
|
||||
'';
|
||||
});
|
||||
|
||||
rtags = dontConfigure (externalSrc super.rtags pkgs.rtags);
|
||||
|
||||
rtags-xref = dontConfigure super.rtags;
|
||||
|
||||
128
pkgs/applications/finance/odoo/odoo15.nix
Normal file
128
pkgs/applications/finance/odoo/odoo15.nix
Normal file
@ -0,0 +1,128 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchurl, python310, nodePackages, wkhtmltopdf
|
||||
, nixosTests }:
|
||||
|
||||
let
|
||||
python = python310.override {
|
||||
packageOverrides = self: super: {
|
||||
pypdf2 = super.pypdf2.overridePythonAttrs (old: rec {
|
||||
version = "1.28.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "py-pdf";
|
||||
repo = "pypdf";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ];
|
||||
|
||||
nativeCheckInputs = with self; [ pytestCheckHook pillow ];
|
||||
});
|
||||
flask = super.flask.overridePythonAttrs (old: rec {
|
||||
version = "2.1.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
|
||||
};
|
||||
});
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
|
||||
version = "2.1.2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
odoo_version = "15.0";
|
||||
odoo_release = "20230720";
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "odoo15";
|
||||
version = "${odoo_version}.${odoo_release}";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-XH4cN2OrPvMjN3VcDJFxCacNxKkrN65jwhUN1dnGwgo="; # odoo
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
tar xfz $src
|
||||
cd odoo*
|
||||
'';
|
||||
|
||||
# needs some investigation
|
||||
doCheck = false;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
"${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
babel
|
||||
chardet
|
||||
decorator
|
||||
docutils
|
||||
ebaysdk
|
||||
freezegun
|
||||
gevent
|
||||
greenlet
|
||||
idna
|
||||
jinja2
|
||||
libsass
|
||||
lxml
|
||||
markupsafe
|
||||
mock
|
||||
num2words
|
||||
ofxparse
|
||||
passlib
|
||||
pillow
|
||||
polib
|
||||
psutil
|
||||
psycopg2
|
||||
pydot
|
||||
pyopenssl
|
||||
pypdf2
|
||||
pyserial
|
||||
python-dateutil
|
||||
python-ldap
|
||||
python-stdnum
|
||||
pytz
|
||||
pyusb
|
||||
qrcode
|
||||
reportlab
|
||||
requests
|
||||
setuptools
|
||||
vobject
|
||||
werkzeug
|
||||
xlrd
|
||||
xlsxwriter
|
||||
xlwt
|
||||
zeep
|
||||
];
|
||||
|
||||
# takes 5+ minutes and there are not files to strip
|
||||
dontStrip = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = { inherit (nixosTests) odoo15; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Source ERP and CRM";
|
||||
homepage = "https://www.odoo.com/";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
}
|
||||
@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
|
||||
|
||||
in {
|
||||
pname = "logseq";
|
||||
version = "0.9.14";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
hash = "sha256-UFl+AqfG0OzT+lHC6Sq+gUQTyvzUQP6Enh+rLSq3Xhc=";
|
||||
hash = "sha256-EOnB3AllfMAhcATEkmf/1S/gkk1ua2dDgvfT91uwohs=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.25.1";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m/VExBibScZt8zlxbTSQtZdbcc1EBZ+k0DXu+pXFUnA=";
|
||||
sha256 = "sha256-HC81GA/kTyppCDLo47tFU08veViGlwwi6U92CP+5X9c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DFf4leS8/891YzZCkkd/rU+cUm94nOnXYDZgJK+NoCY=";
|
||||
cargoHash = "sha256-M+Kgq8iSHdzAoIqnqP1NV0LWt6AComsaSlX0aypEOeA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -102,10 +102,11 @@ stdenv.mkDerivation rec {
|
||||
checkTarget = "test";
|
||||
nativeCheckInputs = [
|
||||
which dtach openssl bash
|
||||
gdb man emacs
|
||||
gdb man
|
||||
]
|
||||
# for the test T-850.sh for notmuch-git, which is skipped when notmuch is
|
||||
# built without sexp-support
|
||||
++ lib.optional withEmacs emacs
|
||||
++ lib.optional withSfsexp git;
|
||||
|
||||
installTargets = [ "install" "install-man" "install-info" ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.35";
|
||||
version = "2.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZJFXQH4bF3O4oMUwBQnoZC2FyL2/DH6AHk4CcHA0fLc=";
|
||||
hash = "sha256-TCCVdPhrR4NWwqNjEAySSsiW2D7gCdLAiD+UeuvBJvI=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
||||
43
pkgs/development/libraries/azmq/default.nix
Normal file
43
pkgs/development/libraries/azmq/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, cmake
|
||||
, ninja
|
||||
, zeromq
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "azmq";
|
||||
version = "unstable-2023-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromq";
|
||||
repo = "azmq";
|
||||
rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf";
|
||||
hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
catch2
|
||||
zeromq
|
||||
];
|
||||
|
||||
# Broken for some reason on this platform.
|
||||
doCheck = !(stdenv.isAarch64 && stdenv.isLinux);
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zeromq/azmq";
|
||||
license = licenses.boost;
|
||||
description = "C++ language binding library integrating ZeroMQ with Boost Asio";
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcint";
|
||||
version = "5.2.1";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunqm";
|
||||
repo = "libcint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sFdigOlS5fAi2dV4dhcPg3roqFdvpnh580WDqTA6DGg=";
|
||||
hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
, gtest
|
||||
, doxygen
|
||||
, fixDarwinDylibNames
|
||||
, useAVX2 ? stdenv.hostPlatform.avx2Support
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
# unaccelerated routines.
|
||||
cmakeFlags = [
|
||||
"-DTILEDB_WERROR=0"
|
||||
];
|
||||
] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";
|
||||
|
||||
nativeBuildInputs = [
|
||||
clang-tools
|
||||
|
||||
@ -6,32 +6,23 @@
|
||||
, lwt
|
||||
, macaddr
|
||||
, mirage-net
|
||||
, mirage-profile
|
||||
, ppx_cstruct
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ethernet";
|
||||
version = "3.0.0";
|
||||
version = "3.2.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
hash = "sha256:0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
hash = "sha256-TB2nAhQiHZ1Dk6n/3i49s9HKNH92yNUl3xl94hByrAk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ppx_cstruct
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cstruct
|
||||
mirage-net
|
||||
macaddr
|
||||
mirage-profile
|
||||
lwt
|
||||
logs
|
||||
];
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
version = "1.73.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
@ -28,6 +28,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-rj+q/06gIvPYTJP/EH9ZrP0Sp4J3K1aCRyNkgpphWP4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
jsonschema
|
||||
@ -35,12 +40,6 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
pytest-env
|
||||
@ -54,6 +53,10 @@ buildPythonPackage rec {
|
||||
"samtranslator"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to transform SAM templates into AWS CloudFormation templates";
|
||||
homepage = "https://github.com/aws/serverless-application-model";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.23.1";
|
||||
version = "1.24.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jL02G4Z2Lhy/02Lb7aSUDEKg2h34UXJbwMFaDSPgc+U=";
|
||||
hash = "sha256-IECJlK1DQl/ndLnreZ/xQ5F06eCgFWZe3fF5LLdqLzo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbus-fast";
|
||||
version = "1.93.0";
|
||||
version = "1.94.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+L9V9Uk5VRucp3r9zrywXzJOfY/9aeWMep6MTiwngVI=";
|
||||
hash = "sha256-0xfoo131l0c1hA7aZpYQJ/kBp8AtAF6aYctBEk++Fqg=";
|
||||
};
|
||||
|
||||
# The project can build both an optimized cython version and an unoptimized
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, bitlist
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, fountains
|
||||
, parts
|
||||
@ -23,15 +22,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/nthparty/fe25519/pull/1
|
||||
(fetchpatch {
|
||||
name = "relax-setuptools-dependency.patch";
|
||||
url = "https://github.com/nthparty/fe25519/commit/0565f60ddbb1aa4755c68edc85b7df12a3a7311e.patch";
|
||||
hash = "sha256-FcqkHPdkYN6y+Pvviul2wDsmhhcycfRGqFhmX5sxo1k=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, fetchPypi
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, rich
|
||||
}:
|
||||
@ -20,6 +21,12 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# remove after https://github.com/eggplants/getjump/pull/123 is released
|
||||
"pillow"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -33,6 +40,9 @@ buildPythonPackage rec {
|
||||
"getjump"
|
||||
];
|
||||
|
||||
# all the tests talk to the internet
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get and save images from jump web viewer";
|
||||
homepage = "https://github.com/eggplants/getjump";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-tricks";
|
||||
version = "3.17.2";
|
||||
version = "3.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "mverleg";
|
||||
repo = "pyjson_tricks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s=";
|
||||
hash = "sha256-xddMc4PvVI+mqB3eeVqECZmdeSKAURsdbOnUAXahqM0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -29,6 +29,9 @@ buildPythonPackage rec {
|
||||
url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff";
|
||||
hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI=";
|
||||
})
|
||||
# skip tests with expired test data
|
||||
# upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373
|
||||
./skip-broken-tests.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py
|
||||
index fbe714f..bbed3c2 100644
|
||||
--- a/tests/src/OneLogin/saml2_tests/response_test.py
|
||||
+++ b/tests/src/OneLogin/saml2_tests/response_test.py
|
||||
@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):
|
||||
response_2 = OneLogin_Saml2_Response(settings, xml_2)
|
||||
self.assertTrue(response_2.check_one_condition())
|
||||
|
||||
+ @unittest.skip("test data expired")
|
||||
def testCheckOneAuthnStatement(self):
|
||||
"""
|
||||
Tests the check_one_authnstatement method of SamlResponse
|
||||
@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):
|
||||
with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'):
|
||||
response_2.is_valid(self.get_request_data(), raise_exceptions=True)
|
||||
|
||||
+ @unittest.skip("test data expired")
|
||||
def testIsInValidNoStatement(self):
|
||||
"""
|
||||
Tests the is_valid method of the OneLogin_Saml2_Response
|
||||
@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase):
|
||||
with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'):
|
||||
response.get_attributes()
|
||||
|
||||
+ @unittest.skip("test data expired")
|
||||
def testIsInValidDestination(self):
|
||||
"""
|
||||
Tests the is_valid method of the OneLogin_Saml2_Response class
|
||||
@ -17,12 +17,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recordlinkage";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aIrx54vnf85I/Kit/4njg/VIOu6H0SE7NdQ1GbeP8Cc=";
|
||||
hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -47,9 +47,17 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTests = [
|
||||
"TestFileTypesDataDriven"
|
||||
|
||||
# Many of the failures below are reported in:
|
||||
# https://github.com/nexB/typecode/issues/36
|
||||
|
||||
# AssertionError: assert 'application/x-bytecode.python'...
|
||||
"test_compiled_python_1"
|
||||
"test_package_json"
|
||||
|
||||
# fails due to change in file (libmagic) 5.45
|
||||
"test_doc_postscript_eps"
|
||||
"test_package_debian"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.21.674";
|
||||
version = "0.21.705";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-sLgTnj1Z/zeAML8B1I40xGuEkyrxYeXVR/Two7vMGP3xmyv/KfssikVu8yFDtA4bdQq9RsLU8GxC74VQKe3txQ==";
|
||||
hash = "sha512-FgZdWEr+F9GuQQABlEQR6egcxRpvYOaL6T732K2d2326B57HXQpm+xPw0axphBwvZo+u3dw7Tz91HcnGhcDR1w==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@ -55,6 +55,13 @@ mkYarnPackage {
|
||||
hash = pinData.uiYarnDepsHash;
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace ./package.json \
|
||||
--replace '$(git rev-parse --short HEAD)' "${src.rev}" \
|
||||
--replace 'yarn clean' 'yarn --offline clean' \
|
||||
--replace 'yarn run rimraf dist' 'yarn --offline run rimraf dist'
|
||||
'';
|
||||
|
||||
yarnPreBuild = ''
|
||||
export npm_config_nodedir=${nodejs}
|
||||
'';
|
||||
@ -79,6 +86,7 @@ mkYarnPackage {
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
passthru.tests.lemmy-ui = nixosTests.lemmy;
|
||||
passthru.commit_sha = src.rev;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Building a federated alternative to reddit in rust";
|
||||
|
||||
@ -52,5 +52,6 @@ stdenv.mkDerivation {
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "pikchr";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, buildGo121Module
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGo121Module rec {
|
||||
pname = "juicity";
|
||||
version = "0.1.3";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juicity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aTg2Xo2+3uxLTJ3MRC46FR/4qBs28IpT6K3KMb8i16s=";
|
||||
hash = "sha256-+P7MFNhWI4aqCtcJhAw3/RtfOkh+b3v2v69pIOznc/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xTpT3Qjg2kAJynLaQLLMmoL/SzpguK2YrlWsq/NYrX4=";
|
||||
vendorHash = "sha256-KrkEqvgHyAoNAX93SE9yDuik60CvPeP+w0Xehi7lgi0=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.15.4";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
hash = "sha256-Tdh6lGk93hGuR+L2cytVoKYfRHrmuNo9OtKqQaeCMx0=";
|
||||
hash = "sha256-kJqJpYjgN49qV/JLfUfmd/f9UjhiM1HOwSONELl2bOk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dtHr+zsjpQe+iNwlj0sRxZRsgl1nxflXhhV1fTMCiFY=";
|
||||
cargoHash = "sha256-HzvNcESNalZp7+k9WH+ohARq0na8Q4NUctqrCOu6gwI=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
@ -35,13 +35,18 @@ rustPlatform.buildRustPackage rec {
|
||||
checkFlags = [
|
||||
"--skip=http_proxy"
|
||||
"--skip=tcp_tunnel"
|
||||
"--skip=tcprelay"
|
||||
"--skip=udp_tunnel"
|
||||
"--skip=udp_relay"
|
||||
"--skip=socks4_relay_connect"
|
||||
"--skip=socks5_relay_aead"
|
||||
"--skip=socks5_relay_stream"
|
||||
"--skip=trust_dns_resolver"
|
||||
];
|
||||
|
||||
# timeouts in sandbox
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Rust port of Shadowsocks";
|
||||
homepage = "https://github.com/shadowsocks/shadowsocks-rust";
|
||||
|
||||
@ -11,10 +11,10 @@ buildGoModule rec {
|
||||
owner = "michelin";
|
||||
repo = "ChopChop";
|
||||
rev = "v${version}";
|
||||
sha256 = "qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E=";
|
||||
hash = "sha256-qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU=";
|
||||
vendorHash = "sha256-UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI to search for sensitive services/files/folders";
|
||||
|
||||
@ -1,22 +1,32 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, notation }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "notation";
|
||||
version = "1.0.0-rc.7";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notaryproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EM2QunSL88Am3zgKwgI94jET3xaVfvsa4MCtMZ3ejjU=";
|
||||
hash = "sha256-mj+LCO6Q4kKfYewPl0R9axZB9O4Yy+GkLlUIDe6yhlI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-88PCnIm7nQB8jLzrfVOyDLXWX7RZeT31n1cwvb4Qza0=";
|
||||
vendorHash = "sha256-wQTRgOSOq0LeiSwF5eowaW4R2xCx+kEb0WQ+upsxdAA=";
|
||||
|
||||
# This is a Go sub-module and cannot be built directly (e2e tests).
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/notaryproject/notation/internal/version.Version=${version}"
|
||||
"-X github.com/notaryproject/notation/internal/version.BuildMetadata="
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = notation;
|
||||
command = "notation version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to sign and verify OCI artifacts and container images";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nvitop";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XuehaiPan";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Za2NJ4gx+aE/cfl2wzbwLxIFNL1UzgKVbb6VqopkNxs=";
|
||||
hash = "sha256-nHJ2m5Q0IWl0nx13iGBkHsHj2YdPS+33kLUBsjbpyuM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "nvidia-ml-py" ];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "languagetool-rust";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeertmans";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iiJSdr7TF1f8/Ve+OKbTDHYWdFkd2IEOzp7Lhlpwb50=";
|
||||
hash = "sha256-YsVK72q+A9T00u9bXIUfGDhwQl5kiLMec6onbp9YKkg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oCRlWYCTmJWTi6LCDEKimsLmqm3JTaQEsKJXrvQP/p8=";
|
||||
cargoHash = "sha256-Yit6zWWEcH5LXpcvy9EXUvRNz+JsyW10fauSNBf1BoU=";
|
||||
|
||||
buildFeatures = [ "full" ];
|
||||
|
||||
|
||||
@ -6099,6 +6099,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
odoo = callPackage ../applications/finance/odoo { };
|
||||
odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { };
|
||||
|
||||
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };
|
||||
|
||||
@ -20693,6 +20694,8 @@ with pkgs;
|
||||
|
||||
ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { };
|
||||
|
||||
azmq = callPackage ../development/libraries/azmq { };
|
||||
|
||||
babl = callPackage ../development/libraries/babl { };
|
||||
|
||||
backward-cpp = callPackage ../development/libraries/backward-cpp { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user