nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
b2e3c3c550
nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

118 lines
2.7 KiB
Nix
Raw Normal View History

treewide: stdenv.lib -> lib
2021-01-24 00:40:18 +00:00
{ lib, stdenv, cleanPackaging, fetchurl }:
{
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
# : string
pname
# : string
, version
# : string
skawarePackages.buildPackage: make sha256 optional Fall back to fakeSha256 if unspecified, like many other fetcher functions now do, to streamline packages / new updates.
2023-11-06 14:59:54 +00:00
, sha256 ? lib.fakeSha256
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
# : string
, description
# : list Platform
, platforms ? lib.platforms.all
# : list string
, outputs ? [ "bin" "lib" "dev" "doc" "out" ]
# TODO(Profpatsch): automatically infer most of these
# : list string
, configureFlags
s6-rc: fix cross builds that run s6-rc-compile The reason for this change is explained in the long comment I added. Here's a simple example of the problem: let pkgs = import <nixpkgs> { crossSystem.system = "aarch64-linux"; }; in pkgs.callPackage ({ stdenv, s6-rc }: stdenv.mkDerivation { name = "s6-rc-compiled"; nativeBuildInputs = [ s6-rc ]; buildCommand = '' mkdir in s6-rc-compile $out in ''; }) {} We're cross compiling for aarch64 here, so we'd expect the scripts generated by this derivation to be things we could run on aarch64. But when I build this on my x86_64 machine, without this change applied, $out/servicedirs/s6rc-oneshot-runner/run gets generated full of references to x86_64 non-cross store paths for execline, s6, and s6-rc. With this change applied, the scripts generated by the above expression now refer to the cross-compiled aarch64 store paths for execline, s6, and s6-rc.
2021-08-18 17:15:47 +00:00
# : string
, postConfigure ? null
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
# mostly for moving and deleting files from the build directory
# : lines
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +00:00
, postInstall
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
# : list Maintainer
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 21:06:56 +00:00
, maintainers ? [ ]
skawarePackages.buildPackage: fix typo in comment
2022-05-09 15:52:56 +00:00
# : passthru arguments (e.g. tests)
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 21:06:56 +00:00
, passthru ? { }
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +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
let
# File globs that can always be deleted
commonNoiseFiles = [
".gitignore"
"Makefile"
"INSTALL"
"configure"
"patch-for-solaris"
"src/**/*"
"tools/**/*"
"package/**/*"
"config.mak"
];
# File globs that should be moved to $doc
commonMetaFiles = [
"COPYING"
"AUTHORS"
"NEWS"
"CHANGELOG"
"README"
"README.*"
skawarePackages: Fall 2021 release Maintainers Notes below. ~~~ Hello, New versions of all the skarnet.org packages are available. skalibs has undergone a major update, with a few APIs having disappeared, and others having changed. Compatibility with previous versions is *not* assured. Consequently, all the rest of the skarnet.org software has undergone at least a release bump, in order to build with the new skalibs. But some packages also have new functionality added (hence, a minor bump), and others also have their own incompatible changes (hence, a major bump). The new versions are the following: skalibs-2.11.0.0 (major) nsss-0.2.0.0 (major) utmps-0.1.0.3 (release) execline-2.8.1.0 (minor) s6-2.11.0.0 (major) s6-rc-0.5.2.3 (release) s6-portable-utils-2.2.3.3 (release) s6-linux-utils-2.5.1.6 (release) s6-linux-init-1.0.6.4 (release) s6-dns-2.3.5.2 (release) s6-networking-2.5.0.0 (major) mdevd-0.1.5.0 (minor) bcnm-0.0.1.4 (release) dnsfunnel-0.0.1.2 (release) Additionally, a new package has been released: smtpd-starttls-proxy-0.0.1.0 Dependencies have all been updated to the latest versions. They are, this time, partially strict: libraries and binaries may build with older releases of their dependencies, but not across major version bumps. The safest approach is to upgrade everything at the same time. You do not need to recompile your s6-rc service databases or recreate your s6-linux-init run-images. You should restart your supervision tree after upgrading skalibs and s6, as soon as is convenient for you. Details of major and minor package changes follow. * skalibs-2.11.0.0 ---------------- - A lot of obsolete or useless functionality has been removed: libbiguint, rc4, md5, iobuffer, skasigaction, environ.h and getpeereid.h headers, various functions that have not proven their value in a while. - Some functions changed signatures or changed names, or both. - All custom types ending in _t have been renamed, to avoid treading on POSIX namespace. (The same change has not been done yet in other packages, but skalibs was the biggest offender by far.) - Signal functions have been deeply reworked. - cdb has been reworked, the API is now more user-friendly. - New functions have been added. The deletion of significant portions of code has made skalibs leaner. libskarnet.so has dropped under 190 kB on x86_64. The cdb rewrite on its own has helped reduce an important amount of boilerplate in cdb-using code. All in all, code linked against the new skalibs should be slightly smaller and use a tiny bit less RAM. https://skarnet.org/software/skalibs/ git://git.skarnet.org/skalibs * nsss-0.2.0.0 ------------ - Bugfixes. - nsss-switch wire protocol slightly modified, which is enough to warrant a major version bump. - _r functions are now entirely thread-safe. - Spawned nsssd programs are now persistent and only expire after a timeout on non-enumeration queries. This saves a lot of forking with applications that can call primitives such as getpwnam() repeatedly, as e.g. mdevd does when initially parsing its configuration file. - New nsssd-switch program, implementing real nsswitch functionality by dispatching queries to various backends according to a script. It does not dlopen a single library or read a single config file. https://skarnet.org/software/nsss/ git://git.skarnet.org/nsss * execline-2.8.1.0 ---------------- - Bugfixes. - New binary: case. It compares a value against a series of regular expressions, executing into another command line on the first match. https://skarnet.org/software/execline/ git://git.skarnet.org/execline * s6-2.11.0.0 ----------- - Bugfixes. - Some libs6 header names have been simplified. - s6-svwait now accepts -r and -R options. - s6-supervise now reads an optional lock-fd file in the service directory; if it finds one, the first action of the service is to take a blocking lock. This prevents confusion when a controller process dies while still leaving workers holding resources; it also prevents log spamming on user mistakes (autobackgrounding services, notably). - New binaries: s6-socklog, s6-svlink, s6-svunlink. The former is a rewrite of smarden.org's socklog program, in order to implement a fully functional syslogd with only s6 programs. The latter are tools that start and stop services by symlinking/unlinking service directories from a scan directory, in order to make it easier to integrate s6-style services in boot scripts for sequential service managers such as OpenRC. https://skarnet.org/software/s6/ git://git.skarnet.org/s6 * s6-networking-2.5.0.0 --------------------- - Bugfixes. - minidentd has been removed. It was an old and somehow still buggy piece of code that was only hanging around for nostalgia reasons. - Full support for client certificates. Details of the client certificate are transmitted to the application via environment variables (or via an environment string in the case of opportunistic TLS). - Full SNI support, including server-side. (That involved a deep dive into the bearssl internals, which is why it took so long.) The filenames containing secret keys and certificates for <domain> are read in the environment variables KEYFILE:<domain> and CERTFILE:<domain>. Complete client certificate and SNI support now make the TLS part of s6-networking a fully viable replacement of stunnel and other similar TLS tunneling tools. This is most interesting when s6-networking is built against bearssl, which uses about 1/9 of the resources that OpenSSL needs. https://skarnet.org/software/s6-networking/ git://git.skarnet.org/s6-networking * mdevd-0.1.5.0 ------------- - A new option to mdevd is available: -O <nlgroups>. This option makes mdevd rebroadcast uevents to a netlink group (or set of netlink groups) once they have been handled. This allows applications to read uevents from a netlink group *after* the device manager is done with them. This is useful, for instance, when pairing mdevd with libudev-zero for full udev emulation. - The * and & directives, which previously were only triggered by "add" and "remove" actions, are now triggered by *all* action types. This gives users full scripting access to any event, which can be used to implement complex rules similar to udev ones. These two changes make it possible to now build a full-featured desktop system based on mdevd + libudev-zero, without running systemd-udevd or eudev. https://skarnet.org/software/mdevd/ git://git.skarnet.org/mdevd * smtpd-starttls-proxy-0.0.1.0 ---------------------------- This new package, in conjunction with the latest s6-networking, implements the STARTTLS functionality for inetd-like mail servers that do not already support it. (Currently only tested with qmail-smtpd.) If you have noticed that sending mail to skarnet.org supports STARTTLS now, it is thanks to this little piece of software. https://skarnet.org/software/smtpd-starttls-proxy/ git://git.skarnet.org/smtpd-starttls-proxy Enjoy, Bug-reports welcome. Laurent
2021-09-26 16:00:07 +00:00
"DCO"
"CONTRIBUTING"
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
];
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 21:06:56 +00:00
in
stdenv.mkDerivation {
buildSkawarePackage: use pname and version directly
2020-03-22 21:13:51 +00:00
inherit pname version;
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +00:00
skaware: switch from git repos to tarballs It should be more performant this way.
2018-09-04 19:55:47 +00:00
src = fetchurl {
url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
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
inherit sha256;
};
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +00:00
inherit outputs;
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
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = configureFlags ++ [
"--enable-absolute-paths"
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
# We assume every nix-based cross target has urandom.
# This might not hold for e.g. BSD.
"--with-sysdep-devurandom=yes"
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
(if stdenv.isDarwin
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 21:06:56 +00:00
then "--disable-shared"
else "--enable-shared")
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
]
# On darwin, the target triplet from -dumpmachine includes version number,
# but skarnet.org software uses the triplet to test binary compatibility.
# Explicitly setting target ensures code can be compiled against a skalibs
# binary built on a different version of darwin.
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
++ (lib.optional stdenv.isDarwin
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 21:06:56 +00:00
"--build=${stdenv.hostPlatform.system}");
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
s6-rc: fix cross builds that run s6-rc-compile The reason for this change is explained in the long comment I added. Here's a simple example of the problem: let pkgs = import <nixpkgs> { crossSystem.system = "aarch64-linux"; }; in pkgs.callPackage ({ stdenv, s6-rc }: stdenv.mkDerivation { name = "s6-rc-compiled"; nativeBuildInputs = [ s6-rc ]; buildCommand = '' mkdir in s6-rc-compile $out in ''; }) {} We're cross compiling for aarch64 here, so we'd expect the scripts generated by this derivation to be things we could run on aarch64. But when I build this on my x86_64 machine, without this change applied, $out/servicedirs/s6rc-oneshot-runner/run gets generated full of references to x86_64 non-cross store paths for execline, s6, and s6-rc. With this change applied, the scripts generated by the above expression now refer to the cross-compiled aarch64 store paths for execline, s6, and s6-rc.
2021-08-18 17:15:47 +00:00
inherit postConfigure;
treewide: optional -> optionals where the argument is a list the argument to optional should not be list
2022-10-06 16:38:53 +00:00
makeFlags = lib.optionals stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ];
skawarePackages: fix llvm build
2022-01-15 20:56:26 +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
# TODO(Profpatsch): ensure that there is always a $doc output!
postInstall = ''
echo "Cleaning & moving common files"
build-support/skaware: factor out clean packaging utils They are useful for other packages as well.
2019-02-24 13:40:10 +00:00
${cleanPackaging.commonFileActions {
noiseFiles = commonNoiseFiles;
docFiles = commonMetaFiles;
}} $doc/share/doc/${pname}
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +00:00
${postInstall}
'';
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
postFixup = ''
build-support/skaware: factor out clean packaging utils They are useful for other packages as well.
2019-02-24 13:40:10 +00:00
${cleanPackaging.checkForRemainingFiles}
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +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
meta = {
homepage = "https://skarnet.org/software/${pname}/";
inherit description platforms;
treewide: stdenv.lib -> lib
2021-01-24 00:40:18 +00:00
license = lib.licenses.isc;
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
maintainers = with lib.maintainers;
skawarePackages.buildPackage: add me as maintainer
2021-06-15 14:12:26 +00:00
[ pmahoney Profpatsch qyliss ] ++ maintainers;
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +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
fdtools: pin to older skalibs version fdtools hasn’t caught up with skalibs yet. We also add a revdep test that alerts us in the future if a skalibs bumb breaks fdtools again.
2021-09-27 11:38:32 +00:00
inherit passthru;
Revert "buildSkawarePackage: pass through extra args" This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
2020-03-22 20:58:11 +00:00
}
Reference in New Issue Copy Permalink