Skip to content

python3Packages.sipsimple: fix build with gcc15; refactor and modernize #477157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Prince213 merged 2 commits into from
Jan 8, 2026
Merged

python3Packages.sipsimple: fix build with gcc15; refactor and modernize #477157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ead681
python3Packages.sipsimple: fix build with gcc15
eljamm Jan 5, 2026
1b6bf4b
python3Packages.sipsimple: rename and modernize
eljamm Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/by-name/bl/blink-qt/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
python3-application
python3-eventlib
python3-gnutls
sipsimple
python3-sipsimple
sqlobject
standard-imghdr
xcaplib
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/sy/sylkserver/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
msrplib
python3-eventlib
python3-gnutls
sipsimple
python3-sipsimple
wokkel
xcaplib
];
Expand Down
83 changes: 42 additions & 41 deletions ...ment/python-modules/sipsimple/default.nix → ...hon-modules/python3-sipsimple/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,7 @@
x264,
python3-application,
}:

let
extDeps = {
pjsip = rec {
# Hardcoded in get_dependencies.sh, checked at buildtime
# need tarball specifically for buildscript to detect it
version = "2.10";
src = fetchurl {
url = "https://github.com/pjsip/pjproject/archive/${version}.tar.gz";
hash = "sha256-k2pMW5hgG1IyVGOjl93xGrQQbGp7BPjcfN03fvu1l94=";
};
patches = [
# Backported https://github.com/pjsip/pjproject/commit/4a8d180529d6ffb0760838b1f8cadc4cb5f7ac03
./pjsip-0001-NEON.patch

# Backported https://github.com/pjsip/pjproject/commit/f56fd48e23982c47f38574a3fd93ebf248ef3762
./pjsip-0002-RISC-V.patch

# Backported https://github.com/pjsip/pjproject/commit/f94b18ef6e0c0b5d34eb274f85ac0a3b2cf9107a
./pjsip-0003-LoongArch64.patch
];
};
zrtpcpp = rec {
# Hardcoded in get_dependencies.sh, NOT checked at buildtime
rev = "6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03";
src = fetchFromGitHub {
owner = "wernerd";
repo = "ZRTPCPP";
inherit rev;
hash = "sha256-kJlGPVA+yfn7fuRjXU0p234VcZBAf1MU4gRKuPotfog=";
};
};
};

applyPatchesWhenAvailable =
extDep: dir:
lib.optionalString (extDep ? patches) (
Expand All @@ -63,15 +30,15 @@ let
'') extDep.patches
);
in
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "python3-sipsimple";
version = "5.3.3.2";
pyproject = true;

src = fetchFromGitHub {
owner = "AGProjects";
repo = "python3-sipsimple";
tag = "${version}-mac";
tag = "${finalAttrs.version}-mac";
hash = "sha256-kDXVzLmgfXxm8phKrV7DvPuZ9O2iNFo1s6Lc0jcc/dM=";
};

Expand Down Expand Up @@ -118,13 +85,13 @@ buildPythonPackage rec {
];

preConfigure = ''
ln -s ${passthru.extDeps.pjsip.src} deps/${passthru.extDeps.pjsip.version}.tar.gz
cp -r --no-preserve=all ${passthru.extDeps.zrtpcpp.src} deps/ZRTPCPP
ln -s ${finalAttrs.passthru.extDeps.pjsip.src} deps/${finalAttrs.passthru.extDeps.pjsip.version}.tar.gz
cp -r --no-preserve=all ${finalAttrs.passthru.extDeps.zrtpcpp.src} deps/ZRTPCPP

bash ./get_dependencies.sh
''
+ applyPatchesWhenAvailable extDeps.pjsip "deps/pjsip"
+ applyPatchesWhenAvailable extDeps.zrtpcpp "deps/ZRTPCPP"
+ applyPatchesWhenAvailable finalAttrs.passthru.extDeps.pjsip "deps/pjsip"
+ applyPatchesWhenAvailable finalAttrs.passthru.extDeps.zrtpcpp "deps/ZRTPCPP"
+ ''
# Fails to link some static libs due to missing -lc DSO. Just use the compiler frontend instead of raw ld.
substituteInPlace deps/pjsip/build/rules.mak \
Expand All @@ -141,13 +108,47 @@ buildPythonPackage rec {
pythonImportsCheck = [ "sipsimple" ];

passthru = {
inherit extDeps;
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^(.*)-mac$"
];
};
extDeps = {
pjsip = rec {
# Hardcoded in get_dependencies.sh, checked at buildtime
# need tarball specifically for buildscript to detect it
version = "2.10";
src = fetchurl {
url = "https://github.com/pjsip/pjproject/archive/${version}.tar.gz";
hash = "sha256-k2pMW5hgG1IyVGOjl93xGrQQbGp7BPjcfN03fvu1l94=";
};
patches = [
# Backported https://github.com/pjsip/pjproject/commit/4a8d180529d6ffb0760838b1f8cadc4cb5f7ac03
./pjsip-0001-NEON.patch

# Backported https://github.com/pjsip/pjproject/commit/f56fd48e23982c47f38574a3fd93ebf248ef3762
./pjsip-0002-RISC-V.patch

# Backported https://github.com/pjsip/pjproject/commit/f94b18ef6e0c0b5d34eb274f85ac0a3b2cf9107a
./pjsip-0003-LoongArch64.patch
];
};
zrtpcpp = rec {
# Hardcoded in get_dependencies.sh, NOT checked at buildtime
rev = "6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03";
src = fetchFromGitHub {
owner = "wernerd";
repo = "ZRTPCPP";
inherit rev;
hash = "sha256-pGng1Y9N51nGBpiZbn2NTx4t2NGg4qkmbghTscJVhIA=";
postFetch = ''
# fix build with gcc15
sed -e '9i #include <cstdint>' -i $out/zrtp/EmojiBase32.cpp
'';
};
};
};
};

meta = {
Expand All @@ -158,4 +159,4 @@ buildPythonPackage rec {
teams = [ lib.teams.ngi ];
maintainers = [ lib.maintainers.ethancedwards8 ];
};
}
})
0 ...n-modules/sipsimple/pjsip-0001-NEON.patch → ...s/python3-sipsimple/pjsip-0001-NEON.patch
View file
Open in desktop
File renamed without changes.
0 ...modules/sipsimple/pjsip-0002-RISC-V.patch → ...python3-sipsimple/pjsip-0002-RISC-V.patch
View file
Open in desktop
File renamed without changes.
0 ...es/sipsimple/pjsip-0003-LoongArch64.patch → ...n3-sipsimple/pjsip-0003-LoongArch64.patch
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ mapAliases {
sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29
shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
sip_4 = throw "'sip_4' has been renamed to/replaced by 'sip4'"; # Converted to throw 2025-10-29
sipsimple = lib.warnOnInstantiate "'sipsimple' has been renamed to 'python3-sipsimple' to fit upstream naming" python3-sipsimple; # added 2026-01-05
slackclient = throw "'slackclient' has been renamed to/replaced by 'slack-sdk'"; # Converted to throw 2025-10-29
smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2025-10-29
smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15654,6 +15654,8 @@ self: super: with self; {

python3-saml = callPackage ../development/python-modules/python3-saml { };

python3-sipsimple = callPackage ../development/python-modules/python3-sipsimple { };
Copy link
Member

@dotlambda dotlambda Jan 8, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd follow the majority on Repology and use

Suggested change
python3-sipsimple = callPackage ../development/python-modules/python3-sipsimple { };
sipsimple = callPackage ../development/python-modules/sipsimple { };

Copy link
Contributor Author

@eljamm eljamm Jan 8, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is called python:sipsimple in repology, but not in the distros' repos? for example in the AUR it's python-sipsimple.

Copy link
Member

@dotlambda dotlambda Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's Arch's standard prefix for Python packages.

Copy link
Contributor Author

@eljamm eljamm Jan 8, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for the info, that's good to know. Would you suggest renaming it again or would it be fine to keep it as python3-sipsimple since it's already like this in repology? If it's the former, perhaps we could do it for all similar packages?

Copy link
Member

@dotlambda dotlambda Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, python3-sipsimple is correct in this case:

It's what ends up in the METADATA file in the output.


pythondialog = callPackage ../development/python-modules/pythondialog { };

pythonefl = callPackage ../development/python-modules/python-efl { };
Expand Down Expand Up @@ -17324,8 +17326,6 @@ self: super: with self; {

siphashc = callPackage ../development/python-modules/siphashc { };

sipsimple = callPackage ../development/python-modules/sipsimple { };

sipyco = callPackage ../development/python-modules/sipyco { };

sirius = toPythonModule (
Expand Down
Loading