Commit Graph

29 Commits

Author SHA1 Message Date
Profpatsch
fc62890f2d 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-19 15:49:39 +02:00
Profpatsch
2d28753c4c 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-18 16:43:51 +02:00
Profpatsch
bbcdd01f6b Revert "skawarePackages.execline: wrap execlineb with tools"
Using wrapProgram adds a call to `bash` around every call
of `execline`, which clearly misses the basic idea behind
`execline` in the first place …

This reverts commit b64d25c447.
2019-10-18 16:43:51 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Will Dietz
18ef1da03d execline: 2.5.0.1 -> 2.5.1.0
https://skarnet.org/software/execline/upgrade.html
2019-03-04 23:23:55 +01:00
Profpatsch
b64d25c447 skawarePackages.execline: wrap execlineb with tools
The execlineb program is the launcher (and lexer) of execline scripts.
So it makes a lot of sense to have all the small tools in scope by
default.
We append to the end of PATH so that they can be easily overwritten by
the user.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
2019-02-23 23:28:26 +01:00
Profpatsch
4616ef1f41 skaware: switch from git repos to tarballs
It should be more performant this way.
2018-09-06 11:53:22 +02:00
Profpatsch
0071ae1d4f 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-06 11:53:22 +02:00
Profpatsch
ec7d4a8089 skaware: update tools & libraries to summer 2018 release
https://www.mail-archive.com/skaware@list.skarnet.org/msg01217.html

No support for yet.
2018-09-06 11:53:22 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Profpatsch
9a95c136d8 execline: 2.3.0.3 -> 2.5.0.0 2018-07-27 17:48:32 +02:00
Profpatsch
4295da8af4 skarnet software: add Profpatsch as maintainer 2018-07-25 00:06:31 +02:00
Profpatsch
710f0f8c10 skarnet software: rename attributes and split outputs
Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
2018-07-25 00:06:31 +02:00
tv
9f4a461278 update skarnet.org packages
execline:          2.2.0.0 -> 2.3.0.3
s6:                2.4.0.0 -> 2.6.1.1
s6-dns:            2.1.0.0 -> 2.2.0.1
s6-linux-utils:    2.2.0.0 -> 2.4.0.2
s6-networking:     2.2.1.0 -> 2.3.0.2
s6-portable-utils: 2.1.0.0 -> 2.2.1.1
s6-rc:             0.1.0.0 -> 0.3.0.0
skalibs:           2.4.0.1 -> 2.6.0.1
2017-11-13 00:09:32 +01:00
Patrick Mahoney
09a5007797 skarnet.org packages: fix darwin build
The configure scripts have been changed so that `--build` is now the
way to specify (non-cross compiling) build target, which is necessary
on darwin for binary compatibility across darwin versions.
2017-03-26 17:30:41 -05:00
Patrick Mahoney
72a0d65d3d update skarnet.org packages
execline:          2.1.4.5 -> 2.2.0.0
s6-dns:            2.0.0.7 -> 2.1.0.0
s6-linux-utils:    2.0.2.3 -> 2.2.0.0
s6-networking:     2.1.0.4 -> 2.2.1.0
s6-portable-utils: 2.1.0.0 -> 2.1.0.0 (no version change)
s6-rc:             0.0.2.1 -> 0.1.0.0
s6:                2.2.4.3 -> 2.4.0.0
skalibs:           2.3.9.0 -> 2.4.0.1

Also use new --enable-absolute-paths configure arg to correctly set
paths to runtime executables to point within the nix store rather than
relying on PATH resolution.
2017-03-26 14:19:44 -05:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Patrick Mahoney
fc1f5d2cf1 set target for darwin binary compat in skarnet.org packages
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
2016-04-01 10:39:37 -05:00
Patrick Mahoney
e0c225857f update skarnet.org packages
skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
2016-04-01 10:38:58 -05:00
Patrick Mahoney
1fcf088a6a execline 2.1.2.0 -> 2.1.4.0 2015-09-23 22:23:21 -05:00
Patrick Mahoney
74964c255e Update skarnet.org software
execline           2.1.2.0
s6-dns             2.0.0.3
s6-networking      2.1.0.1
s6-portable-utils  2.0.5.0
skalibs            2.3.4.0
2015-06-01 15:20:56 -05:00
Patrick Mahoney
9835f18fbd Add myself as maintainer for skarnet software 2015-06-01 15:20:56 -05:00
Patrick Mahoney
00b57f47c7 Update versions of skarnet.org packages
skalibs            2.3.2.0
execline           2.1.1.0
s6                 2.1.3.0
st-portable-utils  2.0.4.0
s6-linux-utils     2.0.2.0
s6-networking      2.1.0.0

Also change path to s6 static library in s6-networking build.
2015-03-28 23:13:45 -05:00
Patrick Mahoney
c2f822489c execline: update to 2.0.1.1 2015-01-15 16:08:33 -06:00
Peter Simons
37ae6de95d s6: don't depend on GNU Make 4.0
The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
2015-01-01 20:36:58 +01:00
Patrick Mahoney
26e74d8a3e Update skarnet.org software for 2.0 release.
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2014-12-23 15:24:30 -06:00
Patrick Mahoney
cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Patrick Mahoney
d8d7cd7ef2 execline: new package
Execline is a small scripting language, to be used in place of a shell
in non-interactive scripts.
2014-08-22 23:40:52 -05:00