diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-24 06:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-24 06:01:33 +0000 |
commit | c1d6d547af0681d59459d7c81b8fe20cbc363c7f (patch) | |
tree | 8e3c516c85918e73336e9e461c07d2a376f830c7 /pkgs/development | |
parent | 5a848335958255a7a0a1fbc0d41f6bfeea93e6cc (diff) | |
parent | 93d3b3c04639d5bbdb3cdc0309fa9169ef7d991e (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/db/db-4.8.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/db/generic.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/pugixml/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/hatch-regex-commit/default.nix | 46 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyloadapi/default.nix | 58 |
5 files changed, 113 insertions, 6 deletions
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 81705374381e7..4d6029d6d8211 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args: -import ./generic.nix (args // { +import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ @@ -9,6 +9,8 @@ import ./generic.nix (args // { ./darwin-mutexes-4.8.patch ]; + drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads"; + drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d715c1ffc8b19..ddb4139e116d1 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,8 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.isFreeBSD "--with-pic" + ++ (drvArgs.configureFlags or []); preConfigure = '' cd build_unix @@ -92,4 +93,4 @@ stdenv.mkDerivation (rec { license = license; platforms = platforms.unix; }; -} // drvArgs) +} // builtins.removeAttrs drvArgs [ "configureFlags" ]) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 403c903577554..fc0eb1dfa2912 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-MAXm/9ANj6TjO1Skpg20RYt88bf6w1uPwRwOHXiXsWw="; + sha256 = "sha256-xxtJr9VeBPxpxWJaDGO635+Ch7ZS6t6VyuXEio+ogZ8="; }; outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; diff --git a/pkgs/development/python-modules/hatch-regex-commit/default.nix b/pkgs/development/python-modules/hatch-regex-commit/default.nix new file mode 100644 index 0000000000000..9cd936d5798f3 --- /dev/null +++ b/pkgs/development/python-modules/hatch-regex-commit/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-regex-commit, + hatchling, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "hatch-regex-commit"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frankie567"; + repo = "hatch-regex-commit"; + rev = "refs/tags/v${version}"; + hash = "sha256-E0DIBBaDmTCsZQ41NcjcbzgJ16BwhdexlrGWBdf77oA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \ + --replace-fail ', "hatch-regex-commit"' "" \ + --replace-fail " --cov-report=term-missing --cov-config=pyproject.toml --cov=hatch_regex_commit --cov=tests" "" + ''; + + build-system = [ hatchling ]; + + dependencies = [ hatchling ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "hatch_regex_commit" ]; + + meta = with lib; { + description = "Hatch plugin to create a commit and tag when bumping version"; + homepage = "https://github.com/frankie567/hatch-regex-commit"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix new file mode 100644 index 0000000000000..aec92117415c9 --- /dev/null +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -0,0 +1,58 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + hatch-regex-commit, + hatchling, + pytest-asyncio, + pytestCheckHook, + python-dotenv, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pyloadapi"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "tr4nt0r"; + repo = "pyloadapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-uOgqc1RqmEk0Lqz/ixlChKTZva7+0v4V8KutLSgPKEE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=src/pyloadapi/ --cov-report=term-missing" "" + ''; + + build-system = [ + hatch-regex-commit + hatchling + ]; + + dependencies = [ aiohttp ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + python-dotenv + ]; + + pythonImportsCheck = [ "pyloadapi" ]; + + meta = with lib; { + description = "Simple wrapper for pyLoad's API"; + homepage = "https://github.com/tr4nt0r/pyloadapi"; + changelog = "https://github.com/tr4nt0r/pyloadapi/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} + |