qvim, vim_configurable: get rid of composableDerivation #43886

FRidh · 2018-07-21T11:51:02Z

Use stdenv.mkDerivation directly instead of composableDerivation.

Some configure flags may have changed as the conversion wasn't exactly
straightforward.

Please test this change. I am no user of this package. Will merge in a week from now.

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.

Use `stdenv.mkDerivation` directly instead of `composableDerivation`. Some configure flags may have changed as the conversion wasn't exactly straightforward.

FRidh · 2018-07-21T11:52:43Z

cc contributors @Ma27 @LnL7 @bjornfor @7c6f434c @vcunat

GrahamcOfBorg · 2018-07-21T12:06:25Z

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/r99pik3abzrizbka8906ccs7vj837356-python-2.7.15/bin/python"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146...
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146

GrahamcOfBorg · 2018-07-21T12:08:05Z

Success on x86_64-darwin (full log)

Attempted: vim_configurable

Partial log (click to expand)

patching script interpreter paths in /nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/mdzgfbangzw62b6cb48dg0q83sxdy12y-bash-4.4-p23/bin/sh"
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/mdzgfbangzw62b6cb48dg0q83sxdy12y-bash-4.4-p23/bin/sh"
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/rr41xvzb7jsvbzh35waxmzhj2bbipgad-python-2.7.15/bin/python"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/mdzgfbangzw62b6cb48dg0q83sxdy12y-bash-4.4-p23/bin/sh"
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/mdzgfbangzw62b6cb48dg0q83sxdy12y-bash-4.4-p23/bin/sh"
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/mdzgfbangzw62b6cb48dg0q83sxdy12y-bash-4.4-p23/bin/sh"
/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146

GrahamcOfBorg · 2018-07-21T12:08:20Z

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/3swzdhnphnbxjcyx2bkk1gh9k8gi3kl6-bash-4.4-p23/bin/sh"
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/3swzdhnphnbxjcyx2bkk1gh9k8gi3kl6-bash-4.4-p23/bin/sh"
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/3swzdhnphnbxjcyx2bkk1gh9k8gi3kl6-bash-4.4-p23/bin/sh"
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/3swzdhnphnbxjcyx2bkk1gh9k8gi3kl6-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/0bxsz2pw8n2f11lwwxwwbb8cdzaw2l9j-python-2.7.15/bin/python"
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/3swzdhnphnbxjcyx2bkk1gh9k8gi3kl6-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146...
/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146

Mic92 · 2018-07-21T13:30:22Z

Then only qvim is left that uses this obscure function.

Mic92 · 2018-07-21T13:30:48Z

@GrahamcOfBorg build vimNox ezquake vim_configurable vimHugeX vimPlugins.pluginnames2nix

GrahamcOfBorg · 2018-07-21T13:32:31Z

Failure on x86_64-darwin (full log)

Attempted: vimNox, vim_configurable, vimHugeX, vimPlugins.pluginnames2nix

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

Partial log (click to expand)

int     sigaltstack(const stack_t * __restrict, stack_t * __restrict)  __DARWIN_ALIAS(sigaltstack) __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
        ^
1 warning and 1 error generated.
make[1]: *** [Makefile:2638: objects/os_unix.o] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-vim_configurable-8.1.0146.drv-0/nix_repository_manager/src'
make: *** [Makefile:29: first] Error 2
builder for '/nix/store/0j4qkns37vlql4nfj6vrpkqigm839c4w-vim_configurable-8.1.0146.drv' failed with exit code 2
building '/nix/store/kcaa0b6fa0hs27mg5p3rpxzxplc78kwc-vimrc.drv'...
building '/nix/store/61l7k7axy495nrvl1q6m7y20jkkskwd3-vim-plugin-names-to-nix.drv'...
�[31;1merror:�[0m build of '/nix/store/0j4qkns37vlql4nfj6vrpkqigm839c4w-vim_configurable-8.1.0146.drv' failed

GrahamcOfBorg · 2018-07-21T13:32:33Z

Success on x86_64-linux (full log)

Attempted: vimNox, ezquake, vim_configurable, vimHugeX, vimPlugins.pluginnames2nix

Partial log (click to expand)

./cd_linux.c
./com_msg.c
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/svfamhrk6kqralsdi8jnr4a2plsffyfp-ezquake-3.0.1
shrinking /nix/store/svfamhrk6kqralsdi8jnr4a2plsffyfp-ezquake-3.0.1/bin/ezquake
strip is /nix/store/90vmpr41dzsx350k5argycaf693hnl1l-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/svfamhrk6kqralsdi8jnr4a2plsffyfp-ezquake-3.0.1/bin
patching script interpreter paths in /nix/store/svfamhrk6kqralsdi8jnr4a2plsffyfp-ezquake-3.0.1
checking for references to /build in /nix/store/svfamhrk6kqralsdi8jnr4a2plsffyfp-ezquake-3.0.1...
building '/nix/store/g8m68w30jix2bakanx95qgg8d5iq914n-vim-plugin-names-to-nix.drv'...

GrahamcOfBorg · 2018-07-21T13:34:33Z

Failure on aarch64-linux (full log)

Attempted: vimNox, ezquake, vim_configurable, vimHugeX, vimPlugins.pluginnames2nix

Partial log (click to expand)

                 from common.h:35,
                 from qwsvdef.h:26,
                 from pr_cmds.c:22:
/nix/store/ffq01cfahpgz03kvanhiipn3gkab7zxh-glibc-2.27-dev/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' output between 4 and 209 bytes into a destination of size 64
   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        __bos (__s), __fmt, __va_arg_pack ());
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
builder for '/nix/store/nndrinngaws9mzclimviql2cxaaaa0y1-ezquake-3.0.1.drv' failed with exit code 2
error: build of '/nix/store/nndrinngaws9mzclimviql2cxaaaa0y1-ezquake-3.0.1.drv' failed

FRidh · 2018-07-21T13:56:31Z

@Mic92 don't forget php. That one is big...

LnL7 · 2018-07-21T13:58:40Z

I thought php and vim_configurable where the only remaining.

FRidh · 2018-07-21T14:51:32Z

I've also added qvim to this PR. cc @ttuegel @grwlf

The expressions are quite similar, so it would also be good to afterwards get them more in line with each other.

Use `stdenv.mkDerivation` directly instead of `composableDerivation`. Some configure flags may have changed as the conversion wasn't exactly straightforward.

LnL7 · 2018-07-21T14:56:56Z

pkgs/applications/editors/vim/qvim.nix


-    enableParallelBuilding = true; # test this
-
-    src = fetchgit {


Is this actually different from vim_configurable? It looks like a copy-paste with a different source and that's already configurable (eg. nox)

GrahamcOfBorg · 2018-07-21T15:07:26Z

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/zx4x3awlz1i6j33hxwhykdppdidx109v-vim_configurable-8.1.0146

GrahamcOfBorg · 2018-07-21T15:14:19Z

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/r99pik3abzrizbka8906ccs7vj837356-python-2.7.15/bin/python"
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146/bin/vimtutor: interpreter directive changed from " /bin/sh" to "/nix/store/z9qg7lpkrajdnlgw5pxp9yx984prl1fi-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146...
/nix/store/sq3j6kfg31ymz5rpcjz0rcqwzpgl7n1l-vim_configurable-8.1.0146

GrahamcOfBorg · 2018-07-21T19:00:35Z

Success on x86_64-darwin (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/rdg9y2b5wqpqsi503idf5bfnq2665vsd-vim_configurable-8.1.0146

vim_configurable: get rid of composableDerivation

539f4f6

Use `stdenv.mkDerivation` directly instead of `composableDerivation`. Some configure flags may have changed as the conversion wasn't exactly straightforward.

FRidh added the 6.topic: hygiene label Jul 21, 2018

GrahamcOfBorg added 6.topic: vim 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jul 21, 2018

FRidh changed the title ~~vim_configurable: get rid of composableDerivation~~ qvim, vim_configurable: get rid of composableDerivation Jul 21, 2018

qvim: get rid of composableDerivation

9cb1e7a

Use `stdenv.mkDerivation` directly instead of `composableDerivation`. Some configure flags may have changed as the conversion wasn't exactly straightforward.

FRidh force-pushed the vim branch from 3b7fa9f to 9cb1e7a Compare July 21, 2018 14:52

LnL7 reviewed Jul 21, 2018

View reviewed changes

GrahamcOfBorg added the 8.has: clean-up label Jul 21, 2018

This was referenced Jul 21, 2018

php: get rid of composableDerivation #43900

Merged

Get rid of composableDerivation #18763

Closed

FRidh merged commit ea91420 into NixOS:master Jul 26, 2018

FRidh deleted the vim branch July 26, 2018 09:42

LnL7 mentioned this pull request Jul 27, 2018

vim-configurable: fix python support #44167

Merged

9 tasks

FRidh mentioned this pull request Aug 4, 2018

Vim appears no longer to be built with GUI #44440

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qvim, vim_configurable: get rid of composableDerivation #43886

qvim, vim_configurable: get rid of composableDerivation #43886

FRidh commented Jul 21, 2018 •

edited

FRidh commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

Mic92 commented Jul 21, 2018

Mic92 commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

FRidh commented Jul 21, 2018

LnL7 commented Jul 21, 2018

FRidh commented Jul 21, 2018

LnL7 Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

qvim, vim_configurable: get rid of composableDerivation #43886

qvim, vim_configurable: get rid of composableDerivation #43886

Conversation

FRidh commented Jul 21, 2018 • edited

Things done

FRidh commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

Mic92 commented Jul 21, 2018

Mic92 commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

FRidh commented Jul 21, 2018

LnL7 commented Jul 21, 2018

FRidh commented Jul 21, 2018

LnL7 Jul 21, 2018

Choose a reason for hiding this comment

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

GrahamcOfBorg commented Jul 21, 2018

FRidh commented Jul 21, 2018 •

edited