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.

Sign up for GitHub

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

Jump to bottom

codimd: fix options #46839

Merged
merged 2 commits into from Sep 18, 2018
Merged

codimd: fix options #46839

merged 2 commits into from Sep 18, 2018

Conversation

WilliButz
Copy link
Member

@WilliButz WilliButz commented Sep 18, 2018 •
edited

This fixes the wrong capitalization of idPCert -> idpCert and removes unneeded defaults from third-party integrations.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: codimd

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: codimd

Partial log (click to expand)

copying path '/nix/store/7laim5vvzxf0c873504mghwxfwvj7apy-qtsensors-5.11.1-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/7m88x1wmbac1xkjqy0xllqxx2p01bmci-qtwebchannel-5.11.1-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/ycfqzy6sabjzngf357rx48ixdz2cr09l-qtlocation-5.11.1-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/g688pxl866vzrxzp3ir473a75wiiv96m-qtwebkit-5.212-alpha-01-26-2018' from 'https://cache.nixos.org'...
copying path '/nix/store/jla9rijan0bf452pwgxqw29a2wavfw0l-phantomjs-2.1.1' from 'https://cache.nixos.org'...
copying path '/nix/store/rcmqqf1d799ampi5mcp47ah4rkxg32dm-node-js-url-2.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/za8l47pl8n9m01dpsifkglq6fddcrw2d-node-markdown-pdf-8.1.1' from 'https://cache.nixos.org'...
copying path '/nix/store/wf06y2v4w91jz08j7ipzg7x7nkb9pv50-codimd-env' from 'https://cache.nixos.org'...
copying path '/nix/store/1rx39c3k2kaz4zqjkxjb9yw54vvbzyia-codimd-1.2.0' from 'https://cache.nixos.org'...
/nix/store/1rx39c3k2kaz4zqjkxjb9yw54vvbzyia-codimd-1.2.0

@WilliButz WilliButz changed the title codimd: fix option configuration.saml.idpCert codimd: fix options Sep 18, 2018
@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: codimd

Partial log (click to expand)

[ 71%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSCSSStyleRule.cpp.o
building of '/nix/store/w2mi5hdppz7wn93gc066x6ddclfpdwxa-qtwebkit-5.212-alpha-01-26-2018.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/2pg7fy6xnklvpjkg28b3d3c41cdqj8x9-phantomjs-2.1.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/pvcrjh7kdc3kzaqb8ikvyn1w1xhi0dvc-node-js-url-2.3.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/21d5dpd5477imp7s9jqcv98gj9q7w2mn-node-markdown-pdf-8.1.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/k7d8sc8znscdjs67whyxqfvk2ymlb1ra-node-phantomjs-prebuilt-2.1.16.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c2myb3s41d5hgnhm3idiivl67n2v3wq5-codemirror-hackmdio-05-07-2018.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/p3hyh0gmn1sfmfsl66076d7wmzm84vrz-codimd-env.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/6lqb5775z74yyri49119i9qnaf5pv6b6-codimd-1.2.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/6lqb5775z74yyri49119i9qnaf5pv6b6-codimd-1.2.0.drv' failed

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: codimd

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: codimd

Partial log (click to expand)

copying path '/nix/store/7laim5vvzxf0c873504mghwxfwvj7apy-qtsensors-5.11.1-bin' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/ycfqzy6sabjzngf357rx48ixdz2cr09l-qtlocation-5.11.1-bin' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/7m88x1wmbac1xkjqy0xllqxx2p01bmci-qtwebchannel-5.11.1-bin' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/g688pxl866vzrxzp3ir473a75wiiv96m-qtwebkit-5.212-alpha-01-26-2018' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/jla9rijan0bf452pwgxqw29a2wavfw0l-phantomjs-2.1.1' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/rcmqqf1d799ampi5mcp47ah4rkxg32dm-node-js-url-2.3.0' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/za8l47pl8n9m01dpsifkglq6fddcrw2d-node-markdown-pdf-8.1.1' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/wf06y2v4w91jz08j7ipzg7x7nkb9pv50-codimd-env' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/1rx39c3k2kaz4zqjkxjb9yw54vvbzyia-codimd-1.2.0' from 'https://nix-cache.s3.amazonaws.com'...
/nix/store/1rx39c3k2kaz4zqjkxjb9yw54vvbzyia-codimd-1.2.0

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: codimd

Partial log (click to expand)

[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSMediaStream.cpp.o
building of '/nix/store/w2mi5hdppz7wn93gc066x6ddclfpdwxa-qtwebkit-5.212-alpha-01-26-2018.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/2pg7fy6xnklvpjkg28b3d3c41cdqj8x9-phantomjs-2.1.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/pvcrjh7kdc3kzaqb8ikvyn1w1xhi0dvc-node-js-url-2.3.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/21d5dpd5477imp7s9jqcv98gj9q7w2mn-node-markdown-pdf-8.1.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/k7d8sc8znscdjs67whyxqfvk2ymlb1ra-node-phantomjs-prebuilt-2.1.16.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c2myb3s41d5hgnhm3idiivl67n2v3wq5-codemirror-hackmdio-05-07-2018.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/p3hyh0gmn1sfmfsl66076d7wmzm84vrz-codimd-env.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/6lqb5775z74yyri49119i9qnaf5pv6b6-codimd-1.2.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/6lqb5775z74yyri49119i9qnaf5pv6b6-codimd-1.2.0.drv' failed

@globin globin merged commit 3961cab into NixOS:master Sep 18, 2018
@globin globin deleted the codimd-fix-saml-option branch September 18, 2018 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@WilliButz @GrahamcOfBorg @globin