jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
cf266b999f
nixpkgs/pkgs/tools/misc/execline/default.nix

53 lines
1.5 KiB
Nix
Raw Normal View History

execline: cleanup dependencies
2020-11-26 13:30:31 +00:00
{ skawarePackages }:
execline: new package Execline is a small scripting language, to be used in place of a shell in non-interactive scripts.
2014-08-23 04:40:52 +00:00
skawarePackages: factor out the common parts Introduce a `skawarePackages.buildPackage` function that contains the common setup, removing a lot of duplication. In particular, we require that the build directory has to be empty after the `fixupPhase`, to make sure every relevant file is moved to the outputs. A next step would be to deduplicate the `configureFlags` attributes and only require a `skawareInputs` field.
2018-09-02 21:31:26 +00:00
with skawarePackages;
execline: new package Execline is a small scripting language, to be used in place of a shell in non-interactive scripts.
2014-08-23 04:40:52 +00:00
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
buildPackage {
pname = "execline";
skawarePackages: Winter 2021-2022 release I bumped all versions of all packages that we packaged so far (I hope). We might want to build an update script at some point, there is a lot of potential for copy & paste errors in these updates. Laurent’s notes below: Hello, New versions of all the skarnet.org packages are available. The changes are, for the most part, minimal: essentially, the new versions fix a bug in the build system that made cross-building under slashpackage more difficult than intended. Very few people should have been impacted by this bug. Some packages had a few more bugfixes; and some packages have additional functionality. No major update; no compatibility break. The new versions are the following: skalibs-2.11.1.0 (minor) nsss-0.2.0.1 (release) utmps-0.1.1.0 (minor) execline-2.8.2.0 (minor) s6-2.11.0.1 (release) s6-rc-0.5.3.0 (minor) s6-portable-utils-2.2.3.4 (release) s6-linux-utils-2.5.1.7 (release) s6-linux-init-1.0.7.0 (minor) s6-dns-2.3.5.3 (release) s6-networking-2.5.1.0 (minor) mdevd-0.1.5.1 (release) bcnm-0.0.1.5 (release) dnsfunnel-0.0.1.3 (release) smtpd-starttls-proxy-0.0.1.1 (release) Dependencies have all been updated to the latest versions. They are not strict: libraries and binaries may build with older releases of their dependencies, although this is not guaranteed. You do not need to recompile your s6-rc service databases. To make use of the new s6-linux-init functionality, however, you will have to recreate your run-image. You do not need to restart your supervision tree, unless you're deleting your old s6 binaries. Details of minor package changes follow. * skalibs-2.11.1.0 ---------------- - New function: opendir_at() * utmps-0.1.1.0 ------------ - New binary: utmps-write, a generic utmp client that can write user-crafted records to the utmp and/or wtmp databases. * execline-2.8.2.0 ---------------- - New -s option to the case binary, enabling fnmatch() (shell) expression matching instead of regular expression matching. * s6-rc-0.5.3.0 ------------- - Bundle contents are now read in a "contents.d/" subdirectory, one file per content, instead of one per line in a "contents" file. In the same way, service dependencies are now read in a "dependencies.d/" subdirectory, one file per dependency. Old "contents" and "dependencies" files are still supported, but deprecated. This change allows better integration of s6-rc service definitions with package managers. * s6-linux-init-1.0.7.0 --------------------- - New -S option to s6-linux-init-maker, forcing a sync on halt even in a container. * s6-networking-2.5.1.0 --------------------- - SNI wildcarding is implemented, as well as a workaround for a bearssl bug causing errors on certificate signatures in certain cases. Enjoy, Bug-reports welcome. And happy holidays to you all! -- Laurent
2021-12-24 17:06:58 +00:00
version = "2.8.2.0";
sha256 = "0h9kb3cx8dw05md6smvs56i4lr8g5n3ljaxy5vj4zs86yc3pdprg";
execline: provide tools to execlineb via execline wrapper Introduces the `execlineb-with-builtins` flag, which when true (default) will add all execline builtins to the PATH of `execlineb`. This is usually what users expect. If the flag is set to `false`, the unpatched execline derivation is returned instead.
2019-10-14 15:11:48 +00:00
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
execline: provide tools to execlineb via execline wrapper Introduces the `execlineb-with-builtins` flag, which when true (default) will add all execline builtins to the PATH of `execlineb`. This is usually what users expect. If the flag is set to `false`, the unpatched execline derivation is returned instead.
2019-10-14 15:11:48 +00:00
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
outputs = [ "bin" "lib" "dev" "doc" "out" ];
execline: provide tools to execlineb via execline wrapper Introduces the `execlineb-with-builtins` flag, which when true (default) will add all execline builtins to the PATH of `execlineb`. This is usually what users expect. If the flag is set to `false`, the unpatched execline derivation is returned instead.
2019-10-14 15:11:48 +00:00
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
# TODO: nsss support
configureFlags = [
"--libdir=\${lib}/lib"
"--dynlibdir=\${lib}/lib"
"--bindir=\${bin}/bin"
"--includedir=\${dev}/include"
"--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
"--with-include=${skalibs.dev}/include"
"--with-lib=${skalibs.lib}/lib"
"--with-dynlib=${skalibs.lib}/lib"
];
postInstall = ''
# remove all execline executables from build directory
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
rm libexecline.*
mv doc $doc/share/doc/execline/html
mv examples $doc/share/doc/execline/examples
mv $bin/bin/execlineb $bin/bin/.execlineb-wrapped
skawarePackages: support static builds via pkgsStatic Most of the skaware packages already build just fine with pkgsStatic, however the wrapper scripts for execline and stdnotify-wrapper needed the `-lskarlib` argument to go at the end. `utmps` and `nsss` still fail with this error: ``` exec ./tools/install.sh -D -m 600 utmps-utmpd /bin/utmps-utmpd /build/utmps-0.0.3.1/tools/install.sh: line 48: can't create /bin/utmps-utmpd.tmp.479: Permission denied make: *** [Makefile:121: /bin/utmps-utmpd] Error 1 ```
2020-02-10 12:51:50 +00:00
# A wrapper around execlineb, which provides all execline
# tools on `execlineb`’s PATH.
# It is implemented as a C script, because on non-Linux,
# nested shebang lines are not supported.
# The -lskarnet has to come at the end to support static builds.
$CC \
execlineb: change execlineb wrapper to C script Instead of using execlineb to define the execlineb wrapper, we replace it by a little C wrapper. This is mainly done because on non-Linux systems (i.e. mainly macOS), it is impossible for a shebang interpreter to be itself a shebang script. It is, however, perfectly fine to have a chain that goes shebang -> ELF -> shebang -> ELF -> … Co-Authored-By: Laurent Bercot <ska-skaware@skarnet.org>
2019-10-18 19:30:59 +00:00
-O \
-Wall -Wpedantic \
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
-D "EXECLINEB_PATH()=\"$bin/bin/.execlineb-wrapped\"" \
-D "EXECLINE_BIN_PATH()=\"$bin/bin\"" \
execlineb: change execlineb wrapper to C script Instead of using execlineb to define the execlineb wrapper, we replace it by a little C wrapper. This is mainly done because on non-Linux systems (i.e. mainly macOS), it is impossible for a shebang interpreter to be itself a shebang script. It is, however, perfectly fine to have a chain that goes shebang -> ELF -> shebang -> ELF -> … Co-Authored-By: Laurent Bercot <ska-skaware@skarnet.org>
2019-10-18 19:30:59 +00:00
-I "${skalibs.dev}/include" \
-L "${skalibs.lib}/lib" \
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
-o "$bin/bin/execlineb" \
skawarePackages: support static builds via pkgsStatic Most of the skaware packages already build just fine with pkgsStatic, however the wrapper scripts for execline and stdnotify-wrapper needed the `-lskarlib` argument to go at the end. `utmps` and `nsss` still fail with this error: ``` exec ./tools/install.sh -D -m 600 utmps-utmpd /bin/utmps-utmpd /build/utmps-0.0.3.1/tools/install.sh: line 48: can't create /bin/utmps-utmpd.tmp.479: Permission denied make: *** [Makefile:121: /bin/utmps-utmpd] Error 1 ```
2020-02-10 12:51:50 +00:00
${./execlineb-wrapper.c} \
-lskarnet
execlineb: change execlineb wrapper to C script Instead of using execlineb to define the execlineb wrapper, we replace it by a little C wrapper. This is mainly done because on non-Linux systems (i.e. mainly macOS), it is impossible for a shebang interpreter to be itself a shebang script. It is, however, perfectly fine to have a chain that goes shebang -> ELF -> shebang -> ELF -> … Co-Authored-By: Laurent Bercot <ska-skaware@skarnet.org>
2019-10-18 19:30:59 +00:00
'';
execline: wrap unconditionally; strip I don't think there's any situation in which an unwrapped execlineb is useful -- if you want to use different versions of the execlineb tool it'll still prefer ones in PATH. At the same time, implementing the wrapper in this way, as a series of two derivations, meant that we didn't get stdenv goodness for the wrapper. This meant that, for example, the wrapper was not stripped, and so execline ended up with runtime dependencies on gcc and the Linux headers. I don't want to have to reimplement this sort of stuff when it's already in stdenv, and so it makes much more sense to create the wrapper in the mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-23 15:42:57 +00:00
}
Reference in New Issue Copy Permalink