Skip to content

privacyidea: fix eval & build#122357

Merged
globin merged 2 commits intoNixOS:masterfrom
Ma27:fix-privacyidea
May 9, 2021
Merged

privacyidea: fix eval & build#122357
globin merged 2 commits intoNixOS:masterfrom
Ma27:fix-privacyidea

Conversation

@Ma27
Copy link
Member

@Ma27 Ma27 commented May 9, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Ma27 added 2 commits May 9, 2021 16:19
@Ma27
python3Packages.privacyidea: fix eval with python3
5b29b74 
While `privacyidea-ldap-proxy` only works on `python2`[1], `privacyidea`
itself works fine with `python3`, however it needs version one of
`pyjwt`[2], so I had to add `pyjwt1` which was already packaged for
`python2`[3] to the `python3` package-set. I think that's fine though
since `python2` should be only used when actually needed which isn't the
case here.

Closes NixOS#122250

[1] privacyidea/privacyidea-ldap-proxy#50
[2] privacyidea/privacyidea#2629
[3] bf9b6b1
@Ma27
python2Packages.privacyidea-ldap-proxy: fix python2 build
67e49db
@Ma27 Ma27 requested review from FRidh, globin and roberth May 9, 2021 15:11
@Ma27 Ma27 requested a review from jonringer as a code owner May 9, 2021 15:11
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label May 9, 2021
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 9, 2021
@globin
Copy link
Member

globin commented May 9, 2021

Also privacyidea-ldap-proxy python 3 porting is in progress: privacyidea/privacyidea-ldap-proxy#54

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 9, 2021 •
edited
Loading

Result of nixpkgs-review pr 122357 at 67e49db run on x86_64-linux 1

4 packages built successfully:
  • python38Packages.privacyidea
  • python38Packages.pyjwt1
  • python39Packages.privacyidea
  • python39Packages.pyjwt1

Result of nixpkgs-review pr 122357 at 67e49db run on aarch64-linux 1

4 packages built successfully:
  • python38Packages.privacyidea
  • python38Packages.pyjwt1
  • python39Packages.privacyidea
  • python39Packages.pyjwt1

@globin globin merged commit 357e6b3 into NixOS:master May 9, 2021
@Ma27 Ma27 deleted the fix-privacyidea branch May 9, 2021 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roberth roberth Awaiting requested review from roberth

@globin globin Awaiting requested review from globin

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

nixosTests.privacyidea does not evaluate

3 participants

@Ma27 @globin @r-rmcgibbo