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

sqlmap: 1.0.11 -> 1.1 #28314

Merged
merged 1 commit into from
Aug 26, 2017
Merged

sqlmap: 1.0.11 -> 1.1 #28314

merged 1 commit into from
Aug 26, 2017

Conversation

fadenb
Copy link
Contributor

@fadenb fadenb commented Aug 16, 2017

Additionally disable sqlmap for python3 as it is incompatible:
"[CRITICAL] incompatible Python version detected ('3.6.1'). For successfully running sqlmap you'll have to use version 2.6 or 2.7 (visit 'http://www.python.org/download/')"

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@fadenb fadenb requested a review from FRidh as a code owner August 16, 2017 12:51
@@ -21394,11 +21394,13 @@ in {
};

sqlmap = buildPythonPackage {
Copy link
Member

Choose a reason for hiding this comment

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

Is it usable as a library? Otherwise I would move it out of pythonPackages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Mic92 moved it out of pythonPackages.
Is the callPackage (https://github.com/NixOS/nixpkgs/pull/28314/files#diff-2afbba83e1b14f9e0c304c769831a0e2R21396) in pythonPackages ok or should I remove that?

@fadenb fadenb force-pushed the sqlmap_update branch 2 times, most recently from 7b981ad to 64bd9ac Compare August 17, 2017 16:17
maintainers = with stdenv.lib.maintainers; [ bennofs ];
};
};
sqlmap = callPackage ../applications/misc/sqlmap { };
Copy link
Member

Choose a reason for hiding this comment

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

I would not leave this here. It confuses users, it will be still available as python3Packages.sqlmap.
We have no aliases.nix for python-packages.nix unfortunally.

Additionally disable sqlmap for python3 as it is incompatible:
"[CRITICAL] incompatible Python version detected ('3.6.1'). For successfully running sqlmap you'll have to use version 2.6 or 2.7 (visit 'http://www.python.org/download/')"
@Mic92 Mic92 merged commit 69e7307 into NixOS:master Aug 26, 2017
@vcunat
Copy link
Member

vcunat commented Aug 29, 2017

Ew, this conflicted with 7a6b150, /cc @FRidh & @Mic92. I resolved now for the other commit, but I mainly didn't want to spend much time resolving conflicts between staging and master that are unrelated to my changes. There were more conflicts, usually trivial where I went for fetchPypi over fetchurl.

A couple more complex cases: for mitmproxy I took the version from 27ac74d and not 19183d1; for flask-testing I took 9b65bc9 over d58e1f1 (different hashes! so I tested).

vcunat added a commit that referenced this pull request Aug 29, 2017
There were some conflicts in python modules, commented at #28314.
@FRidh
Copy link
Member

FRidh commented Aug 29, 2017

Thank you @vcunat. It's really hard to prevent these kind of issues when staging is blocked from merging. I won't attend NixCon but I hope this topic will be discussed.

@vcunat
Copy link
Member

vcunat commented Aug 29, 2017

"blocked" because of slow rebuilds, or do you know about another problem?

@FRidh
Copy link
Member

FRidh commented Aug 29, 2017

When staging is in a state that it cannot be fixed, fixes are contributed but often at the same time new breaking commits are merged/pushed as well, thus "blocking" staging from being merged.

@vcunat
Copy link
Member

vcunat commented Aug 29, 2017

That will be difficult, I think, but we should find some way to improve it. As announced, staging is for non-breaking changes only, but in practice it's difficult to always use it that way. (Because one doesn't have any darwin machines, for example.)

@fadenb fadenb deleted the sqlmap_update branch October 1, 2017 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants