alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
363115 commits 217 branches 121 tags 4.5 GiB
Commit graph

5280 commits

Author SHA1 Message Date
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 ae9337179b.

Fixes: ae9337179b ("vm: deprecate phases")
Fixes: 52b10ee872 ("vmTools refactor: don't use huge `with pkgs;`")
 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
Tobias Bergkvist 64da82731d Add new argument: --chdir DIR (alternative to --run "cd DIR" in makeWrapper) 2021-12-02 03:39:25 +01:00
Tobias Bergkvist a47286f0a0 Add argument --inherit-argv0 to replace use case --argv0 '$0'. Fix wrapProgramBinary by using this new argument 2021-12-02 02:29:00 +01:00
Tobias Bergkvist e3c94f3d6b Use cc instead of gcc in makeBinaryWrapper 2021-12-02 02:07:17 +01:00
Tobias Bergkvist a1e62262bc Replace concat3 with asprintf in set_env_prefix and set_env_suffix. 2021-12-01 23:27:26 +01:00
Tobias Bergkvist 3997e9de67 Switch from malloc to calloc in addFlags 2021-12-01 23:07:30 +01:00
Tobias Bergkvist 97d62a90f5 Switch from exit(1) to abort() in assert_success 2021-12-01 22:56:18 +01:00
Tobias Bergkvist 4e55d34535 Add assertValidEnvName and check that variable name is valid during code generation. Add assert_success, and assert that setenv/unsetenv succeeds to crash if they don't 2021-12-01 22:49:20 +01:00
Ellie Hermaszewska 8b136f75ca
lapack: include lapacke_utils.h in alternatives/lapack 2021-12-01 15:14:47 +08:00
github-actions[bot] 5a8da1a930
Merge staging-next into staging 2021-11-30 06:01:59 +00:00
github-actions[bot] 18ca52de87
Merge master into staging-next 2021-11-30 06:01:26 +00:00
adisbladis b14dde0fd9
Merge pull request #141186 from rycee/emacs-wrapper-static-subdirs 
emacs: resolve wrapper load-path at build time
 2021-11-29 16:21:52 -08:00
github-actions[bot] f11307e4b2
Merge staging-next into staging 2021-11-30 00:02:29 +00:00
github-actions[bot] 941a6593c8
Merge master into staging-next 2021-11-30 00:01:51 +00:00
Maximilian Bosch 8f3eb58a96
Merge pull request #146961 from alyssais/qemu-debug 
qemu: enable debug info
 2021-11-29 16:18:46 +01:00
pasqui23 767d56e834
concatScript: formatting 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2021-11-28 20:43:17 +00:00
Pasquale 67320a1668
concatText: fix typos 2021-11-28 19:35:43 +01:00
Pasquale 0f316ecef2
concatTextFile: init 
nixos/networking: using concatTextFile
 2021-11-28 01:39:42 +01:00
github-actions[bot] c0838c1e7a
Merge master into staging-next 2021-11-25 18:01:08 +00:00
oxalica 3b069a2ef8
bintools-wrapper: add dynamicLinker for riscv 2021-11-26 00:32:33 +08:00
Thiago Kenji Okada 6080ef54eb
Merge pull request #147136 from thiagokokada/add-build-graalvm-native-image 
buildGraalvmNativeImage: init
 2021-11-25 12:24:44 -03:00
Thiago Kenji Okada a5c0f59bf7 buildGraalvmNativeImage: allow nativeImageBuildArgs to be overwritten 2021-11-25 11:02:46 -03:00
github-actions[bot] b244d0edca
Merge master into staging-next 2021-11-25 00:01:54 +00:00
John Ericson f721e0f849
Merge pull request #145107 from Ericson2314/buildRustCrate-sysroot 
build-support/rust: Fix sysroot for cross
 2021-11-24 18:44:13 -05:00
Sandro d245291949
Merge pull request #146772 from Stunkymonkey/mono-dll-fixer-builder 2021-11-24 23:36:33 +01:00
Thiago Kenji Okada f1c16183c8 buildGraalvmNativeImage: fix meta, add --verbose flag 2021-11-24 10:37:33 -03:00
Thiago Kenji Okada d352856ea2 buildGraalvmNativeImage: default executable to pname 2021-11-24 10:37:32 -03:00
Thiago Kenji Okada 1415e30830 buildGraalvmNativeImage: init 
For now it only takes care of the single Jar <-> single Executable case.
This will take care of the majority (all?) use cases we have in nixpkgs
currently.
 2021-11-24 10:37:32 -03:00
github-actions[bot] 588cccd6c5
Merge master into staging-next 2021-11-24 06:01:08 +00:00
Artturi c4851c0d71
Revert msize related commits (#147180) 2021-11-24 02:33:53 +02:00
Jonathan Ringer 4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next 
Conflicts:
	nixos/tests/custom-ca.nix
 2021-11-22 21:33:23 -08:00
github-actions[bot] 9e1911e222
Merge master into staging-next 2021-11-22 12:01:27 +00:00
IvarWithoutBones 1b366cb92b buildDotnetModule: support setting projectFile as an array && properly interpret disabledTests 2021-11-21 22:47:53 +01:00
Alyssa Ross bea767e5fe
separateDebugInfo: skip files objcopy can't read 2021-11-21 21:44:27 +00:00
github-actions[bot] 18ad263272
Merge master into staging-next 2021-11-21 18:01:07 +00:00
Alyssa Ross f508ae8894 mirrors: add kernel.org mirrors where appropriate 2021-11-21 13:52:50 +00:00
Arnout Engelen ee1c5afbb5
Merge pull request #146802 from 0x4A6F/master-trivial-builder-testVersion 
testVersion: name runCommand after package.name
 2021-11-21 14:46:47 +01:00
Ryan Burns 2175b157ac treewide: refactor isi686 && isx86_64 -> isx86 2021-11-20 17:50:41 -08:00
github-actions[bot] 197135904f
Merge staging-next into staging 2021-11-21 00:02:25 +00:00
github-actions[bot] 43d088886e
Merge master into staging-next 2021-11-21 00:01:46 +00:00
Artturin d1c3a49fdd vmTools: set msize to 16KiB temporarily 
hopefully this will reduce the ram usage enough
 2021-11-21 01:13:54 +02:00
0x4A6F 0ca14515c6
testVersion: name runCommand after package.name 2021-11-20 22:00:22 +01:00
Artturi 5e560c4e24
Merge pull request #146783 from Artturin/msize1 2021-11-20 22:49:37 +02:00
Artturin e2ab6321ed vmTools: set msize to 128KiB 
500KiB was causing issues https://github.com/NixOS/nixpkgs/pull/142577
 2021-11-20 20:49:49 +02:00
github-actions[bot] 578939f5e2
Merge staging-next into staging 2021-11-20 18:01:43 +00:00
github-actions[bot] f515d91189
Merge master into staging-next 2021-11-20 18:01:07 +00:00
Felix Buehler 9cda0f4f61 mono-dll-fixer: remove builder.sh 2021-11-20 18:01:00 +01:00
Janne Heß e7467023d0
Merge pull request #146524 from igsha/master 
fetchgitlab: fix unexpected argument
 2021-11-20 16:33:50 +01:00
github-actions[bot] 3b12b5b822
Merge staging-next into staging 2021-11-19 06:01:46 +00:00
github-actions[bot] cd8fe24249
Merge master into staging-next 2021-11-19 06:01:08 +00:00
Artturi d9e8a587e1
Merge pull request #128126 from wentasah/chrootenv-opt 2021-11-19 04:40:34 +02:00
github-actions[bot] 9747d437c5
Merge staging-next into staging 2021-11-19 00:02:17 +00:00
github-actions[bot] c83cfc58e5
Merge master into staging-next 2021-11-19 00:01:26 +00:00
Janne Heß ecf388e90b
vmTools: Make msize larger to silence warning 
See https://issues.guix.gnu.org/47225
 2021-11-18 21:21:49 +01:00
Igor Sharonov 80a1a44c70 fetchgitlab: fix unexpected argument 2021-11-18 21:53:46 +03:00
Robert Hensing 9005cb8835
Merge pull request #145841 from l0b0/fix-indentation 
Fix indentation
 2021-11-18 00:38:59 +01:00
github-actions[bot] c77daf4da1
Merge master into staging-next 2021-11-17 18:00:59 +00:00
Andreas Rammhold 48de1b8ed8
Merge pull request #142699 from steveeJ-forks/fix-import-cargo-lock 
rust: find nested packages in git repositories
 2021-11-17 13:31:57 +01:00
github-actions[bot] f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Sandro e0d488f1a3
Merge pull request #140911 from sersorrel/copy-desktop-items 2021-11-17 02:40:57 +01:00
github-actions[bot] 90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Robert Hensing 1023e5ea4c
Merge pull request #145511 from SuperSandro2000/fetchformgithub 
fetchgithub: fix eval when passing forceFetchGit
 2021-11-17 00:16:29 +01:00
github-actions[bot] 69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
libjared badb5a1af2 fhs-userenv-bubblewrap: add ca-certificates to fhs 
In Arch Linux, many of the certs in /etc/ssl/certs/ are symlinks to
/etc/ca-certificates/extracted/. These symlinks are broken in the FHS
env.

This commit adds ca-certificates to the list of bind mounts, which fixes
connection issues with Steam, wget, etc on Arch Linux hosts.
 2021-11-15 15:29:33 -08:00
Robert Helgesson 3247e75741
emacs: resolve wrapper load-path at build time 
Since the included package set is determined at build time we can also
generate the `subdirs.el` file at build time. This improves startup
time somewhat since we don't have to traverse the directory to add to
`load-path`.

For example,

``` sh-session
$ bench './emacs-old -Q --batch --kill' './emacs-new -Q --batch --kill'
benchmarking bench/./emacs-old -Q --batch --kill
time                 72.77 ms   (71.66 ms .. 73.65 ms)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 72.49 ms   (72.06 ms .. 72.92 ms)
std dev              746.5 μs   (582.4 μs .. 1.008 ms)

benchmarking bench/./emacs-new -Q --batch --kill
time                 40.56 ms   (40.24 ms .. 40.86 ms)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 40.30 ms   (40.12 ms .. 40.51 ms)
std dev              401.9 μs   (311.1 μs .. 555.8 μs)
```

The change does not actually affect the content of `load-path`:

``` sh-session
$ diff -s <(./emacs-old --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') \
          <(./emacs-new --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g')
Files /dev/fd/63 and /dev/fd/62 are identical
```

So in principle the only observable effect should be the improved
startup time.
 2021-11-14 22:31:48 +01:00
Victor Engmark 57b496ea98 misc: Replace tab indentation with spaces 
I've tried to be consistent, using four or eight spaces to line up
with existing code.
 2021-11-14 16:04:46 +13:00
John Ericson 5a7f6e1f18
Merge pull request #144839 from l0b0/fix-redirect 
pkgs/build-support: Redirect to standard error rather than file "2"
 2021-11-13 21:56:43 -05:00
github-actions[bot] 914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot] 4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
Alyssa Ross 26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
Sandro 594fa6aea6
Merge pull request #143994 from Stunkymonkey/ocaml-pname 2021-11-13 13:30:16 +01:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
 2021-11-13 12:35:55 +01:00
Uri Baghin 7111193ee6 writers: fix writeRust on darwin 2021-11-13 11:04:36 +11:00
github-actions[bot] e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot] c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi 69bdaa04d8
Merge pull request #145533 from Artturin/builddotnetpkgconfig 2021-11-13 01:27:33 +02:00
github-actions[bot] 40a54af057
Merge staging-next into staging 2021-11-12 00:01:59 +00:00
github-actions[bot] 026e6c328a
Merge master into staging-next 2021-11-12 00:01:22 +00:00
Artturin ffb9a309b6 buildDotnetPackage: move buildInputs to nativeBuildInputs 
they're run during the build so they belong there
 2021-11-11 22:26:23 +02:00
Artturin f77006c308 buildDotnetPackage: fix nativeBuildInputs 
the nativeBuildInputs of the derivation that uses buildDotnetPackage overshadowed the nativeBuildInputs of buildDotnetPackage
so pkg-config wasn't getting added to the path

dotnet-packages: remove unused arg
 2021-11-11 21:47:50 +02:00
markuskowa 26f5e6dd5f
Merge pull request #143237 from ck3d/fix-runInLinuxImage 
vmTools: Fix missing backing format in runInLinuxImage
 2021-11-11 20:39:17 +01:00
Sandro Jäckel 597e2ce523
fetchgithub: fix eval when passing forceFetchGit 2021-11-11 17:28:35 +01:00
Victor Engmark 8ed1104a4a pkgs/build-support: Redirect to standard error rather than file "2" 2021-11-11 18:14:21 +13:00
github-actions[bot] 62b9b0d9e8
Merge staging-next into staging 2021-11-11 00:02:20 +00:00
github-actions[bot] b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Dmitry Kalinkin 4af5e02055
Merge pull request #143079 from veprbl/pr/singularity_nonstd_store 
singularity-tools.buildImage: fix building from non-standard store paths
 2021-11-10 16:04:30 -05:00
github-actions[bot] d5964b8c81
Merge staging-next into staging 2021-11-10 00:02:09 +00:00
github-actions[bot] 6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro 9975de2d4e
Merge pull request #144693 from mkg20001/fetchgit-hash 2021-11-09 22:22:19 +01:00
Victor Engmark 3ce3e50053
Quote variable references (#144838) 
* pkgs/build-support: Quote variable name

* pkgs/build-support: Quote variable reference

* pkgs/build-support: Quote variable references

Leads to a minor behavior change: there's no trailing space in the
output when `[[ "$linkType" == "static-pie" ]]` is true.
 2021-11-09 19:55:40 +09:00
Maciej Krüger 5c2b1b6a29
fetchgit: support hash parameter alongside sha256 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-11-09 07:40:20 +01:00
Tobias Bergkvist 3a014be2f2 Assert that malloc does not return a NULL pointer for better error messages + to satisfy static analysis tools. 2021-11-09 02:56:32 +01:00
John Ericson 05efb8ed91 build-support/rust/sysroot/src: Use dont* instead of phase list 
Making this separate commit because the original was moved out just the
way it was done before.
 2021-11-08 21:38:58 +00:00
John Ericson c9c3de0131 Update script as rust-src layout has changed 
Use stub lib so `core` and `alloc` are handled symmetrically.
 2021-11-08 20:38:59 +00:00
John Ericson cbd00bab80 build-support/rust: Split out sysroot src derivation 
Hoping to make it usable for `buildRustCrate` too.
 2021-11-08 20:38:59 +00:00
Bernardo Meurer 174995d14f
writeShellApplication: set meta.mainProgram 2021-11-08 09:33:42 -08:00
Bernardo Meurer ba7b7357ac
writeTextFile: allow passing extra derivationArgs 2021-11-08 09:33:40 -08:00
Bernardo Meurer d8ec0eeab7
writeShellApplication: run pre/postCheck hooks 2021-11-08 09:33:38 -08:00