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

grip: 4.3.2 -> 4.4.0, patch to handle front matter #35345

Merged
merged 4 commits into from Feb 24, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 22, 2018

Useful for local rendering of RFC's....

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

copying path '/nix/store/6gpkacrvvaaay1adlcb4b09jrqplq6hq-libgnomecanvas-2.30.3' from 'https://cache.nixos.org'...
copying path '/nix/store/kw6mzcy9g0ksb58sn6rkm7b0f60ad0f9-ORBit2-2.14.19' from 'https://cache.nixos.org'...
copying path '/nix/store/nw3zgig6rmzzhb9vlf0vmkqysm5ggnl8-gconf-2.32.4' from 'https://cache.nixos.org'...
copying path '/nix/store/wqwvvhzqcx38mi5wlsxmzdqnxm4h4vpp-libbonobo-2.32.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1p4xm2zc8m241jkvlyr2pfvrgjhgkc23-gnome-vfs-2.24.4' from 'https://cache.nixos.org'...
copying path '/nix/store/dap6sxj43ykqirkqgph42x7a8wi1j61s-libgnome-2.32.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1syv087rj083z56n9z5xk33sh7ala6zi-libbonoboui-2.24.5' from 'https://cache.nixos.org'...
copying path '/nix/store/bqr1k9zkh0ymvfrfmlaxvxq3wgfgcp24-libgnomeui-2.24.5' from 'https://cache.nixos.org'...
copying path '/nix/store/rn3b4ha66lfsgq8m7mhwshja8clqfrm5-grip-3.3.1' from 'https://cache.nixos.org'...
/nix/store/rn3b4ha66lfsgq8m7mhwshja8clqfrm5-grip-3.3.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘grip-3.3.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/applications/misc/grip/default.nix:19 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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  580k  100  580k    0     0  1293k      0 --:--:-- --:--:-- --:--:-- 1293k

fetching path ‘/nix/store/qksdkg4s1l7cx8fba6qmhyq7wfxl5877-grip-3.3.1’...

*** Downloading ‘https://cache.nixos.org/nar/0bl8jys8j5mm6ahxqhypm6zvx0d7kj35l5krdcs708jsh5spr46f.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/qksdkg4s1l7cx8fba6qmhyq7wfxl5877-grip-3.3.1’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  316k  100  316k    0     0   767k      0 --:--:-- --:--:-- --:--:--  767k

/nix/store/qksdkg4s1l7cx8fba6qmhyq7wfxl5877-grip-3.3.1

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Would you mind moving the expression out of python-packages.nix?

@@ -4895,18 +4895,27 @@ in {
};

grip = buildPythonPackage rec {
version = "4.3.2";
version = "4.4.0";
name = "grip-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

pname

@dtzWill
Copy link
Member Author

dtzWill commented Feb 22, 2018

Sure thing!

Or that's what I thought, but there's already a top-level attribute "grip" and I'm not sure what to call this.
(I was also changing it to use buildPythonApplication since it's an app..)

Thoughts?

@dotlambda
Copy link
Member

Actually, I didn't mean moving it to all-packages.nix, just creating a default.nix in python-modules/grip/.
It is indeed an app and a library, see API section in their README.

(review feedback, thanks!)
@dtzWill
Copy link
Member Author

dtzWill commented Feb 23, 2018

Oh, well hooray then! Updated accordingly, thanks!

})
];

buildInputs = [ pytest responses ];
Copy link
Member

Choose a reason for hiding this comment

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

checkInputs

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/qksdkg4s1l7cx8fba6qmhyq7wfxl5877-grip-3.3.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

copying path '/nix/store/6gpkacrvvaaay1adlcb4b09jrqplq6hq-libgnomecanvas-2.30.3' from 'https://cache.nixos.org'...
copying path '/nix/store/kw6mzcy9g0ksb58sn6rkm7b0f60ad0f9-ORBit2-2.14.19' from 'https://cache.nixos.org'...
copying path '/nix/store/nw3zgig6rmzzhb9vlf0vmkqysm5ggnl8-gconf-2.32.4' from 'https://cache.nixos.org'...
copying path '/nix/store/wqwvvhzqcx38mi5wlsxmzdqnxm4h4vpp-libbonobo-2.32.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1p4xm2zc8m241jkvlyr2pfvrgjhgkc23-gnome-vfs-2.24.4' from 'https://cache.nixos.org'...
copying path '/nix/store/dap6sxj43ykqirkqgph42x7a8wi1j61s-libgnome-2.32.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1syv087rj083z56n9z5xk33sh7ala6zi-libbonoboui-2.24.5' from 'https://cache.nixos.org'...
copying path '/nix/store/bqr1k9zkh0ymvfrfmlaxvxq3wgfgcp24-libgnomeui-2.24.5' from 'https://cache.nixos.org'...
copying path '/nix/store/rn3b4ha66lfsgq8m7mhwshja8clqfrm5-grip-3.3.1' from 'https://cache.nixos.org'...
/nix/store/rn3b4ha66lfsgq8m7mhwshja8clqfrm5-grip-3.3.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘grip-3.3.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/applications/misc/grip/default.nix:19 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.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.grip python3.pkgs.grip

@dtzWill
Copy link
Member Author

dtzWill commented Feb 23, 2018

D'oh, fixed. Feel free to squash (or I can do so, NP). Thanks!

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

=================== 16 passed, 6 deselected in 3.36 seconds ====================
collected 22 items

tests/test_api.py .............                                          [ 81%]
tests/test_cli.py ...                                                    [100%]

============================== 6 tests deselected ==============================
=================== 16 passed, 6 deselected in 5.29 seconds ====================
/nix/store/1h3yss84p6pjw3dihgmvr3midjrmv8sf-python2.7-grip-4.4.0
/nix/store/0l9pyvksrsy4bqvhd6rf6mimdnz27azx-python3.6-grip-4.4.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

tests/test_cli.py ...                                                    [100%]

============================== 6 tests deselected ==============================
=================== 16 passed, 6 deselected in 12.89 seconds ===================
tests/test_cli.py ...                                                    [100%]

============================== 6 tests deselected ==============================
=================== 16 passed, 6 deselected in 21.39 seconds ===================
/nix/store/pv4crpdwj6j7kg91wms311fczkp3w7zp-python2.7-grip-4.4.0
/nix/store/9ax31la7f4179biiiv060h8yia392psl-python3.6-grip-4.4.0

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

I can't even merge, feel free to do that :)

@dtzWill
Copy link
Member Author

dtzWill commented Feb 23, 2018

Since there's no rush on this and out of respect for code ownership, I'll defer to brave sir @FRidh.

Thanks for the review, one day I'll be good at python packaging PR's! :).

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/qksdkg4s1l7cx8fba6qmhyq7wfxl5877-grip-3.3.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/rn3b4ha66lfsgq8m7mhwshja8clqfrm5-grip-3.3.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘grip-3.3.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/applications/misc/grip/default.nix:19 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.

@FRidh FRidh merged commit 3002880 into NixOS:master Feb 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants