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

fix source root locations. #31132

Merged
merged 1 commit into from Nov 2, 2017
Merged

fix source root locations. #31132

merged 1 commit into from Nov 2, 2017

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Nov 2, 2017

These have changed following commit c3255fe.

See also:

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
    • 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.

These have changed following commit
c3255fe.

See also:

- #31004
- #31106
sourceRoot = "source/source";
setSourceRoot = ''
sourceRoot=$(echo */source)
'';

Copy link
Member Author

Choose a reason for hiding this comment

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

It's been suggested not to use "source" directly - #31106 (comment) - hence I changed it as per the comment.

sourceRoot = "source/src/unetbootin";
setSourceRoot = ''
sourceRoot=$(echo */src/unetbootin)
'';

Copy link
Member Author

Choose a reason for hiding this comment

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

It's been suggested not to use "source" directly - #31106 (comment) - hence I changed it as per the comment.

sourceRoot = "source/Unix";
setSourceRoot = ''
sourceRoot=$(echo */Unix)
'';

Copy link
Member Author

Choose a reason for hiding this comment

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

It's been suggested not to use "source" directly - #31106 (comment) - hence I changed it as per the comment.

})
(fetchFromGitHub {
owner = "dlang";
repo = "phobos";
rev = "v${version}";
sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
name = "phobos-v${version}-src";
})
Copy link
Member Author

Choose a reason for hiding this comment

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

Unsure if this is proper way to deal with derivation with multiple sources.

})
(fetchFromGitHub {
owner = "dlang";
repo = "phobos";
rev = "v${version}";
sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
name = "phobos-v${version}-src";
})
Copy link
Member Author

Choose a reason for hiding this comment

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

Unsure if this is proper way to deal with derivation with multiple sources.

})
(fetchFromGitHub {
owner = "ldc-developers";
repo = "dmd-testsuite";
rev = "ldc-v${version}";
sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj";
name = "dmd-testsuite-ldc-v${version}-src";
})
Copy link
Member Author

Choose a reason for hiding this comment

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

Unsure if this is proper way to deal with derivation with multiple sources.

Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

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

Confirmed with nox-review. Thank you very much!

@orivej orivej merged commit 672efa4 into NixOS:master Nov 2, 2017
@orivej orivej mentioned this pull request Nov 2, 2017
8 tasks
@pbogdan pbogdan deleted the sourceroot-fixes branch December 3, 2019 17:06
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

3 participants