Commit Graph

4792 Commits

Author SHA1 Message Date
John Ericson
0ee5640d78 buildRustCrate: Fix extra cross args
Do proper list separation, use ld not cc because rustc doesn't `-Wl,`.
2021-10-06 16:59:19 -04:00
github-actions[bot]
8100032efa
Merge master into staging-next 2021-10-04 00:01:51 +00:00
Shamrock Lee
fecc5d7bff treewide: pkgs/**.nix: remove trailing whitespaces
Manually remove trailing white spaces
in `pkgs/**.nix` with the help of an editor

Auto-generated nix expressions containing trailing whitespaces:

*   pkgs/development/haskell-modules/hackage-packages.nix
    *   See issue https://github.com/NixOS/cabal2nix/issues/208
*   pkgs/**/eggs.nix
    *   I don't know how they are generated,
        but they seems to be Python-related.
2021-10-04 02:13:08 +08:00
github-actions[bot]
8da8988e14
Merge master into staging-next 2021-10-02 18:01:17 +00:00
sternenseemann
e5fe6f4c58 skawarePackages.buildManPages: drop unnecessary sections parameter
Upstream has started passing the `-D` flag to install thankfully, so we
no longer need to create the section subdirectories ahead of time.
2021-10-02 15:03:31 +02:00
github-actions[bot]
1256bc4623
Merge master into staging-next 2021-10-01 18:01:22 +00:00
Sandro
6952befcb3
Merge pull request #138809 from SuperSandro2000/fetchgithub-private 2021-10-01 17:09:44 +02:00
Vladimír Čunát
52b10ee872
vmTools refactor: don't use huge with pkgs;
... especially when scoped over hundreds of lines of code.
2021-09-30 21:26:35 +02:00
github-actions[bot]
19e8f1b28f
Merge master into staging-next 2021-09-29 18:01:07 +00:00
Robert Hensing
286c71a230
Merge pull request #139892 from hercules-ci/dockerTools-test-pullImage
dockerTools: test pullImage
2021-09-29 15:27:49 +02:00
Robert Hensing
16a4da9127 dockerTools: Test pullImage fetcher whenever its implementation changes 2021-09-29 14:41:08 +02:00
Robert Hensing
1a0edf135a dockerTools.exportImage: Make $out a tarball again 2021-09-29 09:34:45 +02:00
Robert Hensing
63bf4539b9 dockerTools.runWithOverlay: Avoid cluttering $out and copying 2021-09-29 09:34:06 +02:00
Robert Hensing
8863a5199d vmTools.createEmptyImage: Add destination parameter 2021-09-29 09:33:14 +02:00
github-actions[bot]
d89952163a
Merge master into staging-next 2021-09-29 06:01:24 +00:00
Justin Bedo
fa0cc611ff
dockerTools: fix export 2021-09-29 15:35:25 +10:00
Justin Bedo
0319228a45
docker-tools: add example for exportImage functionality and test 2021-09-29 15:35:21 +10:00
Timothy DeHerrera
895f3956d2
Merge pull request #127933 from rnhmjoj/qemu-restoration
Qemu restoration
2021-09-28 21:35:23 -06:00
Sandro Jäckel
00dc3dcf8b fetchFromGitHub: allow forcing fetchGit 2021-09-28 15:00:11 +02:00
Sandro Jäckel
b9f8421d48 fetchgithub: allow private repos to use fetchgit 2021-09-28 15:00:11 +02:00
Sandro Jäckel
6f53c06748 fetchgit: add support for netrc file through impure NIX_GIT_SSL_CAINFO env 2021-09-28 15:00:11 +02:00
github-actions[bot]
a70629a8e5
Merge master into staging-next 2021-09-27 18:01:07 +00:00
Profpatsch
843dca38b8 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 14:28:43 +02:00
Profpatsch
bf33c0e62e 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-27 14:28:43 +02:00
Vladimír Čunát
a641e599a8
Merge branch 'staging-next' into staging 2021-09-26 15:03:03 +02:00
Artturi
b31618c72d
Merge pull request #138869 from Artturin/ffetchertests 2021-09-26 03:49:50 +03:00
r-burns
16728283c3
Merge pull request #135619 from r-burns/fpie-musl-fixes
[staging] {cc,binutils}-wrapper: fixes for PIE hardening
2021-09-23 17:55:08 -07:00
Guillaume Girol
8ce8c97a19
Merge pull request #137886 from impl/autopatchelfhook-arch-abi-compat
autoPatchelfHook: improve arch/ABI compatibility, fix packages that use stdenvNoCC
2021-09-22 18:57:40 +00:00
Alyssa Ross
b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
Artturin
c6b56fbf58 fetchfirefoxaddon: add simple test 2021-09-22 05:26:31 +03:00
Jörg Thalheim
57e69a608a
Merge pull request #109636 from mroi/patch-vmtools
vmTools: fix cross compilation
2021-09-22 00:51:22 +01:00
github-actions[bot]
611b805c53
Merge master into staging-next 2021-09-21 18:01:16 +00:00
Bruno Bigras
c426b46aee defaultCrateOverrides: add rdkafka-sys 2021-09-21 12:07:25 -04:00
Robert Hensing
1648346444
Merge pull request #136022 from hercules-ci/fetcher-testing
Fetcher testing
2021-09-21 14:50:28 +02:00
Ryan Burns
37d089c1af {cc,binutils}-wrapper: match leading/trailing arguments
fixes e.g.:
pkgsMusl.libfsm
pkgsMusl.libiscsi
pkgsMusl.nsjail
pkgsMusl.pv

match strings have whitespace on either side, which wasn't
matching leading/trailing arguments previously
2021-09-20 17:24:04 -07:00
Ryan Burns
bd8258a389 cc-wrapper: ensure PIE flags precede PIC flags
fixes:
pkgsMusl.bulletml
pkgsMusl.proot
pkgsMusl.python3

Debian explains this issue well in the dpkg-buildflags manpage:

-fPIE
    Can be linked into any program, but not a shared library (recommended).
-fPIC
    Can be linked into any program and shared library.

On projects that build both programs and shared libraries you might need to
make sure that when building the shared libraries -fPIC is always passed last
(so that it overrides any previous -PIE) to compilation flags such as CFLAGS.

(from https://manpages.debian.org/bullseye/dpkg-dev/dpkg-buildflags.1.en.html#hardening)
2021-09-20 11:03:42 -07:00
github-actions[bot]
ecf5e75910
Merge master into staging-next 2021-09-20 18:01:12 +00:00
Daniël de Kok
24b5074348
Merge pull request #137395 from dermetfan/cargo-lock-restricted
importCargoLock: introduce alternative parameter `lockFileContents`
2021-09-20 18:05:08 +02:00
Robin Stumm
d3018c4522 importCargoLock: introduce alternative parameter lockFileContents
In restricted mode (and therefore with flakes) `builtins.readFile` may not be the result of `builtins.toFile`,
making it impossible to use a generated lockFile (with or without IFD),
and thereby causing evaluation to fail if `system != builtins.currentSystem` on Hydra
so the jobs are not delegated to eligible build machines that support that system.

This is done in a way that avoids rebuilds.
2021-09-20 14:54:40 +02:00
github-actions[bot]
9e5021eef4
Merge master into staging-next 2021-09-20 12:01:15 +00:00
Robert Hensing
f44ece5469
Merge pull request #137302 from divanorama/patch-5
use --verbatim-files-from in dockerTools
2021-09-20 13:53:02 +02:00
Théo Zimmermann
20291381c1 coqPackages.mkCoqDerivation: rely on namePrefix to compute default opam-name
As suggested by Cyril Cohen in https://github.com/NixOS/nixpkgs/pull/134362#discussion_r698379405.
2021-09-20 11:10:23 +02:00
Noah Fontes
a7f5e8321e
autoPatchelfHook: fix packages that use stdenvNoCC
autoPatchelfHook actually doesn't depend on stdenv and only needs
bintools (with its wrapper). This change uses $NIX_BINTOOLS instead of
$NIX_CC and makes the dependency on bintools explicit.
2021-09-18 21:58:02 -07:00
Noah Fontes
4765a3e153
autoPatchelfHook: improve arch/ABI compatibility
Fully enabling crossSystem support for autoPatchelfHook came with some
perhaps unintended consequences of being a bit more aggressive about
patching ELF files from architectures/ABIs that differ from the target
(previously, those files would be ignored because ldd usually couldn't
handle them).

This change adds architecture and rough OS ABI detection to the script
so that it doesn't try to blindly replace the interpreter of files that
can't possibly use that interpreter, and also makes sure it doesn't
accidentally use libraries of other architectures/ABIs.
2021-09-18 21:57:08 -07:00
rnhmjoj
b29c2f97c3
nixos/lib/qemu-flags: rename to qemu-common
The current name is misleading: it doesn't contain cli arguments,
but several constants and utility functions related to qemu.
This commit also removes the use of `with import ...` for clarity.
2021-09-18 16:58:16 +02:00
github-actions[bot]
c4fd2a8f99
Merge master into staging-next 2021-09-18 00:01:33 +00:00
github-actions[bot]
a21275cdae
Merge master into staging-next 2021-09-17 18:01:14 +00:00
John Ericson
d3407f1a3b cc-wrapper: Add support for -mthumb / -marm 2021-09-17 17:12:54 +00:00
sternenseemann
fb1348d433 bintools-wrapper: check if bintools to wrap isGNU, not stdenv
The wrapped bintools and the one used to build the wrapper can differ.
2021-09-17 17:06:24 +02:00
github-actions[bot]
6a10b23c61
Merge staging-next into staging 2021-09-16 00:02:05 +00:00