Thomas Watson
d8bb89b9ff
make-initrd: fix reproducibility problems with hard links
2022-01-29 18:07:11 -05:00
Colin
66d547dec8
garble: 20200107 -> 0.5.1, switch to go_1_17
...
This was pretty straightforward, note that go1.17 is explicitly required
by v0.5.1, and one of the tests requires git, so I added it to the
checkInputs.
Also the tests now pass and don't need the mangle, so I removed the
patch. I left the darwin/aarch64 patch in.
2022-01-30 07:42:46 +10:00
Jan Tojnar
2da5ce4ab3
Merge branch 'staging-next' into staging
...
; Conflicts:
; pkgs/development/python-modules/fakeredis/default.nix
2022-01-28 14:05:11 +01:00
Sandro
27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker
2022-01-27 14:06:36 +01:00
Dmitry Kalinkin
0693fd77f7
Merge branch 'staging-next' into staging
...
Conflicts:
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
nixos/doc/manual/release-notes/rl-2205.section.md
pkgs/development/python-modules/aioesphomeapi/default.nix
pkgs/development/python-modules/mat2/default.nix
pkgs/development/python-modules/pydevccu/default.nix
pkgs/development/python-modules/pywlroots/default.nix
pkgs/development/python-modules/rokuecp/default.nix
2022-01-27 00:54:10 -05:00
polykernel
4a9d9928dc
nixos/nix-daemon: use structural settings
...
The `nix.*` options, apart from options for setting up the
daemon itself, currently provide a lot of setting mappings
for the Nix daemon configuration. The scope of the mapping yields
convience, but the line where an option is considered essential
is blurry. For instance, the `extra-sandbox-paths` mapping is
provided without its primary consumer, and the corresponding
`sandbox-paths` option is also not mapped.
The current system increases the maintenance burden as maintainers have to
closely follow upstream changes. In this case, there are two state versions
of Nix which have to be maintained collectively, with different options
avaliable.
This commit aims to following the standard outlined in RFC 42[1] to
implement a structural setting pattern. The Nix configuration is encoded
at its core as key-value pairs which maps nicely to attribute sets, making
it feasible to express in the Nix language itself. Some existing options are
kept such as `buildMachines` and `registry` which present a simplified interface
to managing the respective settings. The interface is exposed as `nix.settings`.
Legacy configurations are mapped to their corresponding options under `nix.settings`
for backwards compatibility.
Various options settings in other nixos modules and relevant tests have been
updated to use structural setting for consistency.
The generation and validation of the configration file has been modified to
use `writeTextFile` instead of `runCommand` for clarity. Note that validation
is now mandatory as strict checking of options has been pushed down to the
derivation level due to freeformType consuming unmatched options. Furthermore,
validation can not occur when cross-compiling due to current limitations.
A new option `publicHostKey` was added to the `buildMachines`
submodule corresponding to the base64 encoded public host key settings
exposed in the builder syntax. The build machine generation was subsequently
rewritten to use `concatStringsSep` for better performance by grouping
concatenations.
[1] - https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2022-01-26 21:04:50 -05:00
Felix Buehler
59c55f4558
update-walker: remove because unused
2022-01-26 21:46:59 +01:00
Martin Weinelt
48f17360d9
Merge remote-tracking branch 'origin/master' into staging-next
2022-01-25 15:53:19 +01:00
Alyssa Ross
1a60dd2adc
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/cupy/default.nix
pkgs/development/python-modules/staticjinja/default.nix
2022-01-24 15:39:34 +00:00
Jonathan Ringer
4bde5a3a68
libredirect: fix build for aarch64-darwin (PR #156460 )
2022-01-24 12:20:51 +01:00
Zhong Jianxin
57829cc246
fetchgithub: Support sparseCheckout
2022-01-24 11:31:41 +08:00
Zhong Jianxin
36cc03e151
fetchgit: Add test for sparseCheckout
2022-01-24 11:23:56 +08:00
Zhong Jianxin
d03a07d5a7
fetchgit: Support sparse checkout
...
This allow git checkout small parts of a large repo, and avoid fetching
unnecessary blobs from server.
2022-01-24 11:23:56 +08:00
Robert Scott
e3e0626730
Merge pull request #155519 from risicle/ris-libredirect-unlink-rmdir-mktemp
...
libredirect: add support for `unlink(at)?`, `rmdir`, `mko?stemps?`, `mkd?temp`
2022-01-21 23:50:54 +00:00
github-actions[bot]
b74b591fbe
Merge master into staging-next
2022-01-20 00:01:46 +00:00
Andreas Rammhold
31e5b8dc21
Remove myself from maintainers
...
I don't have time and energy to deal with all of this anymore.
2022-01-20 00:24:52 +01:00
github-actions[bot]
0fdca24272
Merge master into staging-next
2022-01-19 00:01:38 +00:00
Linus Heckemann
f76bef6136
Merge pull request #145258 from Ma27/steam-resolv-conf-override
...
steam: fix `/etc/resolv.conf` reference in FHS env
2022-01-18 22:59:08 +01:00
Robert Scott
86783a69c2
libredirect: add support for mktemp
2022-01-18 20:20:29 +00:00
Robert Scott
d38832ace0
libredirect: add support for mkdtemp
2022-01-18 20:20:28 +00:00
Robert Scott
2185a70fa4
libredirect: add support for mkstemp family of functions
2022-01-18 20:20:28 +00:00
Robert Scott
b3a7dc22d1
libredirect: add support for unlink, unlinkat, rmdir
...
add coverage of these and mkdir functions in tests
2022-01-18 20:20:27 +00:00
github-actions[bot]
d1d6f982a8
Merge master into staging-next
2022-01-16 18:00:59 +00:00
Pavol Rusnak
5c32667d6e
Merge pull request #154677 from IvarWithoutBones/dotnetModule-installphase
...
buildDotnetModule: wrap executables in preFixup
2022-01-16 15:22:54 +01:00
github-actions[bot]
0173b359a6
Merge master into staging-next
2022-01-16 12:01:11 +00:00
Christian Kampka
b648a4742e
skawarePackages.buildPackage: reformat with nixpkgs-fmt
2022-01-15 22:06:56 +01:00
Christian Kampka
bb88853516
skawarePackages: fix llvm build
2022-01-15 21:56:26 +01:00
Jörg Thalheim
37ed2951d2
libredirect: improve musl support ( #154039 )
...
__nss_files_open is glibc only. Also mark some linux specific system
calls as such for better portability with other unixes.
2022-01-12 01:35:23 -05:00
IvarWithoutBones
fcbd429742
buildDotnetModule: wrap executables in preFixup
...
Not doing this used to break wrapGAppsHook as gappsWrapperArgs is set in preFixup, but it was used in installPhase
2022-01-12 00:23:53 +01:00
Jan Tojnar
f7aa55946b
Merge branch 'staging-next' into staging
...
; Conflicts:
; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
; nixos/doc/manual/release-notes/rl-2205.section.md
; pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
Graham Christensen
de94824ee4
Merge pull request #153457 from heyarne/bugfix/build-graalvm-native-image-utf8
...
buildGraalVmNativeImage: enable utf-8 by default
2022-01-09 09:14:29 -05:00
github-actions[bot]
3ce63131a1
Merge master into staging-next
2022-01-09 00:01:57 +00:00
Robert Hensing
91917122d3
Merge pull request #126718 from roberth/testEqualDerivation
...
testEqualDerivation: init
2022-01-08 21:44:21 +01:00
Robert Hensing
d75b85c5dc
Merge pull request #147690 from pasqui23/hosts
...
concatTextFile: init
2022-01-08 20:40:31 +01:00
github-actions[bot]
b40a01817b
Merge master into staging-next
2022-01-08 18:01:00 +00:00
Robert Hensing
c555a4e329
testEqualDerivation: init
2022-01-08 15:18:57 +01:00
Dmitry Bogatov
17577f6b54
pkgsStatic.libredirect: print error message why it won't work
...
The whole point of libredirect is manipulation with LD_PRELOAD, which is not
supposed to work on static builds.
2022-01-08 14:14:35 +00:00
github-actions[bot]
cf7efe1192
Merge staging-next into staging
2022-01-08 12:01:36 +00:00
Dmitry Kalinkin
477540469e
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/gradient-utils/default.nix
pkgs/development/python-modules/gradient/default.nix
2022-01-08 02:39:35 -05:00
Jonas Chevalier
1e910209ae
mkShell: make it buildable ( #153194 )
...
When I designed `mkShell`, I didn't have a good idea of what the output
should look like and so decided to make the build fail. In practice,
this causes quite a bit of confusion and complications because now the
shell cannot be part of a normal package set without failing the CI as
well.
This commit changes that build phase to record all the build inputs in a
file. That way it becomes possible to build it, makes sure that all the
build inputs get built as well, and also can be used as a GC root.
(by applying the same trick as #95536 ).
The documentation has also been improved to better describe what mkShell
does and how to use it.
2022-01-08 01:54:04 +01:00
Moritz Angermann
38377ab026
libredirect: build fat library for x86_64, arm64, arm64e on darwin ( #153441 )
...
macOS's dyld can be rather picky as to what dylib it accepts. This
even changes across macOS versions. Therefore we now build a fat
dylib with all three architectures (x86_64, arm64, arm64e). This
should then be compatible with pretty much any macOS's dyld.
2022-01-07 18:32:21 -05:00
github-actions[bot]
1342506d40
Merge staging-next into staging
2022-01-07 00:04:19 +00:00
github-actions[bot]
4da57fcb62
Merge master into staging-next
2022-01-07 00:01:42 +00:00
Renaud
952aa6f820
Merge pull request #148606 from McSinyx/fetch-srht-recurse
...
fetchFromSourcehut: allow recursive fetching
2022-01-06 22:55:23 +01:00
Pasquale
86e2880d11
tests.concat: added empty case
2022-01-04 23:14:50 +01:00
heyarne
ce9b3a3723
buildGraalVmNativeImage: enable utf-8 by default
...
The tools built with buildGraalVmNativeImage have broken UTF-8 support
when not properly setting the locale, e.g.
$ bb -e '(prn "bépo àê")'
"b??po ????"
This commit sets the locale to en_US.UTF-8 by default, which fixes that.
2022-01-04 09:56:34 +01:00
github-actions[bot]
d6a3b9cec5
Merge staging-next into staging
2022-01-04 06:01:41 +00:00
github-actions[bot]
872c4bf219
Merge master into staging-next
2022-01-04 06:01:03 +00:00
github-actions[bot]
25662d01ae
Merge staging-next into staging
2022-01-04 00:02:40 +00:00
Dmitry Kalinkin
7a95bc1b14
garble: mark as broken on darwin
2022-01-03 18:53:54 -05:00
Martin Weinelt
11a0b61783
Merge remote-tracking branch 'origin/master' into staging-next
2022-01-03 23:21:08 +01:00
Nguyễn Gia Phong
b97ccaa18d
fetchFromSourcehut: allow recursive fetching
2022-01-03 16:37:16 +07:00
Sandro
5f58402c94
fetchurl: also check certificate when using all zero hash ( #152608 )
2022-01-02 13:01:17 +01:00
Ben Pye
29b40b07db
fhs-userenv-bubblewrap: allow additional arguments to bwrap
2022-01-01 16:53:27 -08:00
Ryan Burns
85cc2c3e8a
Merge pull request #152829 from r-burns/libredirect-musl
...
[staging] libredirect: fix musl build
2022-01-01 14:51:56 -08:00
Moritz Angermann
14996789a1
Check link type based on expanded parameters
...
So far we've ignored response files in arguments, and did not
check linkType against expanded parameters. This means if
we have `-static` in a @reponse-file, linkType will not be
set to `-static` as we never check against the expanded arguments
from response files.
2022-01-01 20:30:56 +08:00
github-actions[bot]
38dc27dab2
Merge staging-next into staging
2022-01-01 00:02:16 +00:00
github-actions[bot]
c30032af77
Merge master into staging-next
2022-01-01 00:01:38 +00:00
Yana Timoshenko
719567e91f
maintainers: update personal details
2021-12-31 21:48:55 +03:00
github-actions[bot]
f2adf20b71
Merge staging-next into staging
2021-12-31 18:01:40 +00:00
github-actions[bot]
df24694c45
Merge master into staging-next
2021-12-31 18:01:05 +00:00
Jörg Thalheim
2b91ac56ad
Merge pull request #152458 from alyssais/vmTools-test
...
vmTools/test: fix
2021-12-31 15:48:41 +00:00
Jörg Thalheim
d6fee2a44a
vmTools/test: fix pcmanfm instead of pan
...
This goes much quicker. Also disable parallel build for machines with
many cores to avoid running out of memory.
2021-12-31 16:47:22 +01:00
Jan Tojnar
d995596052
Merge branch 'staging-next' into staging
...
; Conflicts:
; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
; nixos/doc/manual/release-notes/rl-2205.section.md
2021-12-31 15:32:37 +01:00
Jan Tojnar
380c030740
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/python-modules/aiohttp-socks/default.nix
; pkgs/development/python-modules/emv/default.nix
; pkgs/development/python-modules/mocket/default.nix
; pkgs/development/python-modules/types-protobuf/default.nix
2021-12-31 07:26:03 +01:00
Ryan Burns
830900ff6a
libredirect: fix musl build
2021-12-30 15:29:30 -08:00
IvarWithoutBones
612f808fcc
buildDotnetModule: stop passthru attributes from being overwritten
2021-12-30 18:55:03 +01:00
Pasquale
5187d2cd8f
concatText: test now works
2021-12-30 13:12:34 +01:00
Yureka
c420487e0b
fetchYarnDeps: support more url types
2021-12-30 11:13:25 +01:00
Alyssa Ross
37c5db5a29
vmTools/test: add missing backing format
2021-12-28 13:10:16 +00:00
Alyssa Ross
80b5b4917c
vmTools/test: give pan build more memory
2021-12-28 13:10:15 +00:00
Alyssa Ross
55b883448e
vmTools.buildRPM: properly derive source name
...
This fixes e.g. building the rpm of patchelf as in
pkgs/build-support/vm/test.nix. The glob won't work if there are
multiple spec files but I don't think rpmbuild would work in that case
either.
2021-12-28 13:10:13 +00:00
Alyssa Ross
e0455e1e29
vmTools: fix phases
...
These gave missing attribute errors. They should have been written as
strings in ae9337179bae9337179b52b10ee872
2021-12-28 13:10:11 +00:00
Alyssa Ross
812fe6a2b3
vmTools/test: update for new releases
2021-12-28 12:40:57 +00:00
github-actions[bot]
6c181e1244
Merge staging-next into staging
2021-12-28 12:01:59 +00:00
github-actions[bot]
2e759d4fd0
Merge master into staging-next
2021-12-28 12:01:23 +00:00
Jörg Thalheim
61d501ee3f
Merge pull request #152197 from K900/patch-3
...
rust/hooks: ensure the build output ends up in the right place
2021-12-28 11:33:07 +00:00
Gabriella Gonzalez
07f1f2ca9c
makeWrapper: Add --prefix-each flag ( #145104 )
...
This is for symmetry with `--suffix-each`, and also because
(in my limited experience), `--prefix-each` is more useful since it
ensures that the new entries superseded the existing `PATH` entries
2021-12-27 22:15:06 -08:00
Naïm Favier
10ec5da56e
tests.trivial-builders.overriding: update after shellDryRun
2021-12-27 20:30:01 -05:00
Naïm Favier
f2065d81ad
stdenv/generic: introduce shellDryRun
...
Add `shellDryRun` to the generic stdenv and substitute it for uses of
`${stdenv.shell} -n`. The point of this layer of abstraction is to add
the flag `-O extglob`, which resolves #126344 in a more direct way.
2021-12-27 20:30:01 -05:00
Thiago Kenji Okada
24f9dcd06b
buildGraalvmNativeImage: fix meta
2021-12-27 19:49:52 -03:00
K900
deb7e771aa
rust/hooks: ensure the build output ends up in the right place
...
Otherwise cargoInstallHook can fail to find and actually install it.
2021-12-26 11:04:07 +03:00
Dmitry Kalinkin
2ddda43924
Merge branch 'staging' into staging-next
...
Conflicts:
pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
Dmitry Kalinkin
2ab60f6132
Merge pull request #146205 from expipiplus1/ellie-libsurvive2
...
lapack: include lapacke_utils.h in alternatives/lapack
2021-12-25 17:07:33 -05:00
Maximilian Bosch
f3f82d8330
steam: fix /etc/resolv.conf reference in FHS env
...
It seems as if it's a problem if `/etc/resolv.conf` is a symlink to
`/run/systemd/resolve/stub-resolv.conf` which is the case when using
`systemd-resolved.service`:
bwrap: Can't bind mount /oldroot/etc/resolv.conf on /newroot/etc/resolv.conf: Unable to mount source on destination: No such file or directory
I confirmed that by following the symlink of `/etc/resolv.conf`
(pointing to `/run/systemd/resolve/stub-resolv.conf`) with `readlink -f`
the issues are all gone.
2021-12-25 19:32:52 +01:00
github-actions[bot]
b7f2d2da61
Merge master into staging-next
2021-12-24 00:01:44 +00:00
Felix Buehler
81eb599e8d
nuget-to-nix: update to use pname instead of name
2021-12-23 22:47:34 +01:00
Felix Buehler
989e950f48
buildDotnetPackage: rename baseName to pname
2021-12-23 22:46:35 +01:00
github-actions[bot]
5e2c1acfa3
Merge master into staging-next
2021-12-22 18:01:00 +00:00
Tomas Bravo
80ab168c4a
nix-prefetch-git: fix incorrect mktemp usage
2021-12-22 16:45:18 +01:00
Pavol Rusnak
4c252f40af
Merge pull request #151468 from IvarWithoutBones/dotnetmodule-tests
...
buildDotnetModule: restore and build testProjectFile
2021-12-22 15:12:09 +01:00
github-actions[bot]
39d035c4cf
Merge master into staging-next
2021-12-22 00:01:35 +00:00
Doron Behar
203bc068e0
Merge pull request #151573 from ncfavier/make-binary-wrapper/mkdir
2021-12-21 20:37:06 +02:00
Naïm Favier
ffdf9681ab
makeBinaryWrapper: create destination directory
2021-12-21 18:22:49 +01:00
IvarWithoutBones
e0b652c3cb
buildDotnetModule: restore and build testProjectFile
2021-12-20 22:31:18 +01:00
IvarWithoutBones
0f3d546116
buildDotnetModule: set dontWrapGApps to avoid double wrapping
...
This also removes the flag from opentabletdriver and opentracker, which
manually set it before.
2021-12-20 21:54:40 +01:00
Dmitry Kalinkin
ac40a963c9
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/applications/editors/vim/common.nix
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
pkgs/development/python-modules/pymavlink/default.nix
2021-12-20 12:09:28 -05:00
adisbladis
4192dce538
melpa2nix: Ignore large file warnings
...
While we haven't encountered any problems related to this in MELPA
it's just a matter of time (this just happened for an ELPA package
(phps-mode)).
2021-12-19 08:07:18 -08:00
adisbladis
9a86a53ec5
emacs: Ignore large file warnings for native compilation
...
This was blocking building phps-mode with native compilation enabled.
2021-12-19 08:05:28 -08:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
Pavol Rusnak
fc1c566fa5
Merge pull request #150587 from IvarWithoutBones/dotnetModule-fetchdep
...
buildDotnetModule: add passthru.fetch-deps
2021-12-18 14:18:34 +01:00
github-actions[bot]
647c8d800f
Merge master into staging-next
2021-12-18 12:01:13 +00:00
Andrew Brooks
57718902e3
nixos/tests/docker-tools: add test for pre-runAsRoot layer unpack order
2021-12-17 19:26:53 -06:00
Andrew Brooks
69ffb0004a
dockerTools.buildImage: unpack base image layers in correct order
2021-12-17 18:28:10 -06:00
github-actions[bot]
001096a857
Merge master into staging-next
2021-12-17 12:01:31 +00:00
Alyssa Ross
0acf53bdb1
runInLinuxVM: set 9p msize to 128K
...
This fixes the following warning from QEMU, by using the value that
will be the default in newer kernels[1].
> 9p: degraded performance: a reasonable high msize should be chosen
> on client/guest side (chosen msize is <= 8192). See
> https://wiki.qemu.org/Documentation/9psetup#msize for details.
For a runInLinuxVM derivation I have that does a large amount of
IO[2], this change results in a fairly small but repeatable speed
increase.
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
[2]: https://spectrum-os.org/git/spectrum/tree/installer/default.nix?id=06dd70500a9e475d23e3296dddf409d84abf9b9c#n52
2021-12-17 07:52:11 +00:00
sternenseemann
d860ba7f09
Merge remote-tracking branch 'origin/master' into staging-next
2021-12-15 11:30:31 +01:00
Markus S. Wamser
b93e478777
writers.PyPy{2,3}: init
2021-12-15 10:01:08 +01:00
Markus S. Wamser
4e42f6bcb3
writers.writePython2: remove
2021-12-15 09:56:14 +01:00
IvarWithoutBones
8e11dcca48
buildDotnetModule: add passthru.fetch-deps
2021-12-14 20:24:18 +01:00
github-actions[bot]
0242879f3f
Merge master into staging-next
2021-12-14 12:01:17 +00:00
Luke Granger-Brown
5abdc76f23
Merge pull request #150066 from ezemtsov/buildDotnetModule
...
buildDotnetModule: add support for local project references
2021-12-14 08:39:24 +00:00
Evgeny Zemtsov
06477cccf7
buildDotnetModule: support local project references
2021-12-13 19:14:44 +01:00
Evgeny Zemtsov
a6d02a5214
buildDotnetModule: support optional nupkg packing
2021-12-13 19:13:40 +01:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next
2021-12-13 12:20:07 +01:00
Uri Baghin
356656f143
Merge pull request #148605 from mikepurvis/bazel-no-curses-master
...
buildBazelPackage: Pass --curses=no for terse logs
2021-12-13 12:51:22 +11:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/celery/default.nix
pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Robert Hensing
02b8cdef4b
Merge pull request #149493 from alyssais/vmtools-fd
...
vmTools.runInLinuxVM: create fd symlinks in /dev
2021-12-11 17:44:19 +01:00
github-actions[bot]
92aabc6576
Merge master into staging-next
2021-12-10 00:01:53 +00:00
Robert Hensing
9fb7d91888
Merge pull request #124556 from bergkvist/bergkvist/make-c-wrapper
...
Generate tiny compiled binary for wrapping executables
2021-12-10 00:45:30 +01:00
Jacek Galowicz
d5e028a441
make-binary-wrapper: Make CC substitution safer
2021-12-09 17:22:55 +01:00
Jacek Galowicz
87fcb7b79e
make-binary-wrapper: Add -euo pipefail to bash script
2021-12-09 17:22:55 +01:00
Jacek Galowicz
b7e00ed89e
make-binary-wrapper: Add -Wall -Werror -Wpedantic
2021-12-09 17:22:55 +01:00
Tobias Bergkvist
df13841609
Merge branch 'bergkvist/make-c-wrapper' into make-c-wrapper
2021-12-09 13:00:24 +01:00
Jacek Galowicz
177f0a6eed
make makeWrapper and makeBinaryWrapper drop-in-replaceable
2021-12-09 11:32:29 +00:00
Doron Behar
32d566e1b9
wrapProgramBinary -> binaryWrapProgram
2021-12-08 18:59:38 +02:00
Jacek Galowicz
f3b16a6b5d
Fix typo in make-binary-wrapper
2021-12-08 10:26:17 +00:00
Alyssa Ross
9c4c0f89a5
vmTools.runInLinuxVM: create fd symlinks in /dev
...
These are usually set up by systemd, but there's no systemd in the
VM. /dev/fd is required for <(...) syntax in bash, and I'm sure lots
of things depend on the stdin/stdout/stderr links as well.
2021-12-08 00:32:29 +00:00
Tobias Bergkvist
7cf1aa102a
Separate out indentation responsibility to indent4 in makeCWrapper using awk.
...
Generated code no longer needs to worry about its own indent level in the output.
2021-12-07 17:42:54 +01:00
Jonathan Ringer
9dd8bffe92
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/aiocron/default.nix
2021-12-07 00:11:07 -08:00
(cdep)illabout
69bbd81c62
dhallDirectoryToNix: add this utility function
2021-12-07 13:36:21 +09:00
(cdep)illabout
599e3c2e83
dhallPackageToNix: function for turning Nixpkgs Dhall package into Nix code
2021-12-07 13:36:20 +09:00
(cdep)illabout
32c93844f5
dhallToNix: rename file from build-support/dhall-to-nix.nix to build-support/dhall/to-nix.nix
2021-12-07 13:36:19 +09:00
Tobias Bergkvist
2b5a2d4a8e
Switch to embedding input arguments instead of generated C code in binary.
2021-12-07 01:50:38 +01:00
github-actions[bot]
ffbac7335b
Merge master into staging-next
2021-12-06 18:01:23 +00:00
Michael Raskin
65b2df8b45
golly: 3.3 -> 4.1
2021-12-06 16:27:09 +01:00
github-actions[bot]
89378919a6
Merge master into staging-next
2021-12-05 12:01:19 +00:00
Enno Richter
10c725dc6b
writers.makePythonWriter: drop flake8 checks for Python 2 scripts
2021-12-05 09:59:47 +01:00
Mike Purvis
1bf1417a3f
buildBazelPackage: Pass --curses=no for terse logs
2021-12-04 23:36:40 +00:00
github-actions[bot]
d4c54e7f61
Merge master into staging-next
2021-12-04 18:01:05 +00:00
Robert Hensing
430c9173e4
Merge pull request #148363 from hercules-ci/add-dockerTools-fakechroot
...
dockerTools: Add fakechroot to fakeRootCommands
2021-12-04 15:13:37 +01:00
Robert Hensing
ddda5f28e1
dockerTools: Keep fakechroot disabled by default
...
Avoid risk of breaking existing images by making it opt-in.
2021-12-04 13:49:10 +00:00
Robert Hensing
0e9bc9ffd1
dockerTools: Add fakechroot to fakeRootCommands
2021-12-04 13:49:10 +00:00
Alyssa Ross
4760a907ea
pkg-config: make comment clearer for non-natives
...
Suggested-by: Jörg Thalheim <joerg@thalheim.io>
2021-12-02 16:11:43 -08:00
Alyssa Ross
801078806b
pkg-config: always pass --static in static builds
...
By default, pkg-config output will not include Requires.private
dependencies (which specify dependencies that only apply when building
statically). It will only do this when passed --static. In
pkgsStatic, let's ensure pkg-config is always operating in static
mode, because pkgsStatic will ensure that any libraries pkg-config
might find will always be static, and so will always need their
Requires.private dependencies.
This is very useful for Meson builds, because otherwise Meson will
only pass --static to pkg-config if the dependency was explicitly
"static : true", which is not likely to be the case for most stuff
we're building.
An alternative proposal was to patch Meson to add a special
environment variable to force dependencies to be "static : true". I
feel that the approach I've taken here is less invasive.
2021-12-02 16:11:43 -08:00
Jonathan Ringer
2e6fadac4e
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
2021-12-02 16:07:50 -08:00
github-actions[bot]
987163192b
Merge master into staging-next
2021-12-03 00:01:31 +00:00
Robert Hensing
66c19d856b
Merge pull request #148341 from hercules-ci/add-dockerTools-customization-layer-dependencies
...
dockerTools: Add store dependencies of the customization layer
2021-12-03 00:20:44 +01:00
Robert Hensing
d0bcc212de
nixosTests.docker-tools: Use unique binary in test case
2021-12-02 22:26:05 +00:00
Pasquale
1bc5179d1e
concatText: add test
2021-12-02 21:55:23 +01:00
