Skip to content
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.

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

sigal: 2.0 -> 2.1 #88759

Merged
merged 5 commits into from Oct 5, 2020
Merged

sigal: 2.0 -> 2.1 #88759

merged 5 commits into from Oct 5, 2020

Conversation

@matthiasbeyer
Copy link
Contributor

@matthiasbeyer matthiasbeyer commented May 24, 2020

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.
@Infinisil
Copy link
Member

@Infinisil Infinisil commented Aug 23, 2020

@matthiasbeyer Can you update the PR?

@@ -6605,7 +6605,9 @@ in

sieve-connect = callPackage ../applications/networking/sieve-connect {};

sigal = callPackage ../applications/misc/sigal { };
sigal = callPackage ../applications/misc/sigal {
inherit (python.passthru) pythonAtLeast;
Copy link
Member

@Infinisil Infinisil Aug 23, 2020

No need for this line now. Also, can you squash the commits already?

@@ -1,14 +1,16 @@
{ lib, python3Packages, ffmpeg_3 }:
{ lib, python3Packages, pythonAtLeast, ffmpeg }:
Copy link
Contributor

@risicle risicle Sep 7, 2020

You're still referring to ffmpeg_3 down in makeWrapperArgs which is causing this to fail.

Also you don't need the pythonAtLeast arg here anymore.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@marsam marsam merged commit 1d5a8a0 into NixOS:master Oct 5, 2020
19 of 20 checks passed
dawidsowa added a commit to dawidsowa/nixpkgs that referenced this issue Oct 11, 2020
Only build with python at least at 3.6.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants