-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
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
gixy: init at 0.1.8 #31574
gixy: init at 0.1.8 #31574
Conversation
This seems to break certbot 0.11.1, commit coming up :) |
I added a section to handle the different dependencies for each supported python version which should fix the build errors from travis. |
I am unable to reproduce the failing |
It fails only on Darwin, when trying to execute an empty script with |
pkgs/top-level/python-packages.nix
Outdated
@@ -8632,11 +8634,11 @@ in { | |||
|
|||
ConfigArgParse = buildPythonPackage rec { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are moving Python expressions out of pkgs/top-level/python-packages.nix
into pkgs/development/python-modules/<module>/default.nix.
Please move the expression there, and call it from pkgs/top-level/python-packages.nix
using callPackage ../development/python-modules/<package> { };.
I think that |
@orivej I have set plaforms to |
👍 on updating |
@GrahamcOfBorg build gixy |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Failure for system: x86_64-darwin
error: Package ‘gixy-0.1.8’ in /tmp/nix-ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/31574/pkgs/tools/admin/gixy/default.nix:40 is not supported on ‘x86_64-darwin’, refusing to evaluate.
a) For `nixos-rebuild` you can set
{ nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.
b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Success for system: x86_64-linux
tests.plugins.test_simply.test_from_config('alias_traversal', '/tmp/nix-build-gixy-0.1.8.drv-0/source/tests/plugins/simply/alias_traversal/simple.conf', {u'severity': [u'MEDIUM', u'HIGH']}) ... ok
tests.plugins.test_simply.test_from_config('alias_traversal', '/tmp/nix-build-gixy-0.1.8.drv-0/source/tests/plugins/simply/alias_traversal/not_slashed_alias.conf', {u'severity': [u'MEDIUM', u'HIGH']}) ... ok
tests.plugins.test_simply.test_from_config('alias_traversal', '/tmp/nix-build-gixy-0.1.8.drv-0/source/tests/plugins/simply/alias_traversal/not_slashed_alias_fp.conf', {u'severity': [u'MEDIUM', u'HIGH']}) ... ok
tests.plugins.test_simply.test_from_config('alias_traversal', '/tmp/nix-build-gixy-0.1.8.drv-0/source/tests/plugins/simply/alias_traversal/slashed_alias_fp.conf', {u'severity': [u'MEDIUM', u'HIGH']}) ... ok
----------------------------------------------------------------------
Ran 290 tests in 4.458s
OK
/nix/store/llxwkj0lyqa6i4xnj9nfjdyg8pyy0xwd-gixy-0.1.8
Can you squash the 2 ConfigArgParse and the two gixy commits so there's just init at for gixy and old -> new for ConfigArgParse? |
@disassembler I also rebased it to the current master |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor changes are needed.
Furthermore, security.acme needs to be tested if its indeed impacted. cc @fpletz
name = "ConfigArgParse-${version}"; | ||
version = "0.12.0"; | ||
|
||
src = fetchurl { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fetchPypi
{ stdenv, lib, buildPythonPackage, fetchurl, pythonPackages }: | ||
|
||
buildPythonPackage rec { | ||
name = "ConfigArgParse-${version}"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pname = "ConfigArgParse";
and drop the name attribute.
This is something new in buildPythonPackage
.
# no tests in tarball | ||
doCheck = false; | ||
|
||
meta = with stdenv.lib; { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
license, description, maintainer?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this package didn't have any maintainer before, I added myself and also a short description from the repo and the license.
pkgs/tools/admin/gixy/default.nix
Outdated
{ lib, fetchFromGitHub, python, pythonPackages | ||
, python27Packages, python35Packages, python36Packages }: | ||
let | ||
pyPkgs = (if python.pythonVersion=="3.5" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to disappear. You can just use python.pkgs
instead of pythonPackages
.
pkgs/tools/admin/certbot/default.nix
Outdated
@@ -4,13 +4,13 @@ | |||
|
|||
python2Packages.buildPythonApplication rec { | |||
name = "certbot-${version}"; | |||
version = "0.11.1"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
simp_le and thus security.acme need to be tested
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just ran the acme
test successfully
pkgs/tools/admin/gixy/default.nix
Outdated
version = "0.1.8"; | ||
|
||
# package is only compatible with python 2.7 and 3.5+ | ||
disabled = !(lib.versionAtLeast python.pythonVersion "3.5" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pythonOlder or pythonNewer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't find pythonNewer
anywhere and used pythonAtLeast
instead, which I guess you meant anyway.
pkgs/tools/admin/gixy/default.nix
Outdated
|
||
# package is only compatible with python 2.7 and 3.5+ | ||
disabled = !(lib.versionAtLeast python.pythonVersion "3.5" | ||
|| python.pythonVersion == "2.7"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isPy27
pkgs/tools/admin/gixy/default.nix
Outdated
sha256 = "0dg8j8pqlzdvmyfkphrizfqzggr64npb9mnm1dcwm6c3z6k2b0ii"; | ||
}; | ||
|
||
patchPhase = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
postPatch
We've done the simp_le bump already because the ToS hash of LetsEncrypt changed again. We need a rebase here. |
…hon-modules - fetch with `fetchPypi` - add license, description and myself as maintainer
@fpletz rebased onto master again |
gixy is a nginx static configuration analyzer.
Things done
acme<0.12,>=0.11
, which changed to 0.12 with the certbot update abovedevelopment/python-modules
and gixy totools/admin
build-use-sandbox
innix.conf
on non-NixOS)acme
] via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)nix-shell -p nox --run "nox-review wip"
./result/bin/
)