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

Problem: racket-doc deps don't build due to circularity #74

Merged
merged 4 commits into from
Mar 10, 2018
Merged

Problem: racket-doc deps don't build due to circularity #74

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56eaab0
Problem: racket-index failing
clacke Mar 9, 2018
b77675b
Problem: reverse circular dependencies not removed
clacke Mar 9, 2018
1cb3d11
Problem: racket-index patch is not applied consistently
clacke Mar 9, 2018
61fe3b5
Problem: racket-doc deps don't build due to circularity
clacke Mar 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions nix/racket2nix.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,19 @@
(define never-dependency-names '("racket"))
(define terminal-package-names '("racket-lib"))
(define force-reverse-circular-build-inputs #hash(
["racket-doc" . ("deinprogramm-signature")]
["htdp-lib" . ("deinprogramm-signature")]))
["drracket-tool-lib" . ("racket-index")]
["plai-lib" . ("racket-index" "drracket-tool-lib")]
["rackunit-typed" . ("racket-index")]
["typed-racket-more" . ("racket-index" "rackunit-typed")]
["htdp-lib" . ("deinprogramm-signature" "racket-index" "plai-lib" "drracket-tool-lib"
"rackunit-typed" "typed-racket-more")]

["math-lib" . ("racket-index" "rackunit-typed" "typed-racket-more")]
["data-enumerate-lib" . ("racket-index" "rackunit-typed" "typed-racket-more" "math-lib")]
["plot-lib" . ("racket-index" "rackunit-typed" "typed-racket-more" "math-lib")]
["plot-gui-lib" . ("racket-index" "rackunit-typed" "typed-racket-more" "math-lib" "plot-lib")]
["plot-compat" . ("racket-index" "rackunit-typed" "typed-racket-more" "math-lib" "plot-lib"
"plot-gui-lib")]))

(define header-template #<<EOM
{ pkgs ? import <nixpkgs> {}
Expand Down Expand Up @@ -39,6 +50,8 @@ let mkRacketDerivation = lib.makeOverridable (attrs: stdenv.mkDerivation (rec {
buildInputs = [ unzip racket attrs.racketBuildInputs ];
circularBuildInputsStr = lib.concatStringsSep " " attrs.circularBuildInputs;
racketBuildInputsStr = lib.concatStringsSep " " attrs.racketBuildInputs;
racketConfigBuildInputs = builtins.filter (input: ! builtins.elem input attrs.reverseCircularBuildInputs) attrs.racketBuildInputs;
racketConfigBuildInputsStr = lib.concatStringsSep " " racketConfigBuildInputs;
srcs = [ attrs.src ] ++ (map (input: input.src) attrs.reverseCircularBuildInputs);
inherit racket;

Expand Down Expand Up @@ -73,11 +86,9 @@ let mkRacketDerivation = lib.makeOverridable (attrs: stdenv.mkDerivation (rec {
'';

patchPhase = ''
case $name in
racket-index)
if [ -d racket-index ]; then
( cd racket-index && patch -p3 < ${racketIndexPatch} )
;;
esac
fi
'';

racket-cmd = "${racket.out}/bin/racket -G $out/etc/racket -U -X $out/share/racket/collects";
Expand Down Expand Up @@ -137,7 +148,7 @@ let mkRacketDerivation = lib.makeOverridable (attrs: stdenv.mkDerivation (rec {

mkdir -p $out/etc/racket $out/share/racket
# Don't use racket-cmd as config.rktd doesn't exist yet.
racket ${make-config-rktd} $out ${racket} ${racketBuildInputsStr} > $out/etc/racket/config.rktd
racket ${make-config-rktd} $out ${racket} ${racketConfigBuildInputsStr} > $out/etc/racket/config.rktd

remove_deps="${circularBuildInputsStr}"
if [[ -n $remove_deps ]]; then
Expand All @@ -164,7 +175,7 @@ let mkRacketDerivation = lib.makeOverridable (attrs: stdenv.mkDerivation (rec {
if [ -z "${circularBuildInputsStr}" ]; then
for install_name in $install_names; do
case ''${install_name#./} in
racket-doc|drracket) ;;
drracket|racket-doc|racket-index) ;;
*)
${raco} setup --no-user --no-pkg-deps --fail-fast --only --pkgs ''${install_name#./} # |
# sed -ne '/updating info-domain/,$p'
Expand Down