Commit Graph

5292 Commits

Author SHA1 Message Date
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
Bernardo Meurer
949182a4a2
writeShellApplication: document runtimeShell == stdenv.shell assumption 2021-11-08 09:33:37 -08:00
Bernardo Meurer
014b23232f
writeShellApplication: fix typo in inline docs 2021-11-08 09:33:36 -08:00
Bernardo Meurer
97de845b60
writeShellApplication: fix setting pipefail 2021-11-08 09:33:35 -08:00
Bernardo Meurer
21c299f077
writeShellApplication: get shellcheck from pkgsBuildHost 2021-11-08 09:33:34 -08:00
Bernardo Meurer
0e4f04b74c
writeShellApplication: buildInputs -> runtimeInputs 2021-11-08 09:33:33 -08:00
Bernardo Meurer
89979c9c5b
writeShellApplication: init 2021-11-08 09:33:32 -08:00
Victor Engmark
0383d1c760 pkgs/build-support: Remove unused local variable 2021-11-09 01:25:34 +09:00
John Ericson
4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
John Ericson
18ed048c7b build-support/rust: Organize
- `toRustTarget` and friends pulled out from rust tools into rust
   library. Since they don't depend on any packages they can be more
   widely useable.

 - `build-rust-package` gets its own directory

 - `fetch-cargo-tarball` gets its own directory
2021-11-07 14:16:49 -05:00
github-actions[bot]
eeb7e66e97
Merge master into staging-next 2021-11-06 18:01:01 +00:00
Domen Kožar
e57174c9d2
Merge pull request #144653 from stephank/fix/libredirect
libredirect: fix on darwin
2021-11-06 07:05:59 -06:00
github-actions[bot]
a41ea4ced3
Merge master into staging-next 2021-11-06 06:01:07 +00:00
Alyssa Ross
4419e8ee8e
mirrors: prioritize HTTPS 2021-11-06 01:07:38 +00:00
Alyssa Ross
1b78d3720c
mirrors: use HTTPS where available 2021-11-06 01:07:36 +00:00
Alyssa Ross
246d34d57a
mirrors: remove inactive mirrors 2021-11-06 01:07:34 +00:00
Alyssa Ross
9c70596689
mirrors: update sunet base URLs 2021-11-06 00:45:08 +00:00
Stéphan Kochen
7acc0e054c libredirect: workaround dyld env not inherited 2021-11-05 20:47:11 +01:00
Stéphan Kochen
d1a3b5c4cc libredirect: use __interpose on darwin
DYLD_FORCE_FLAT_NAMESPACE was removed in recent versions of macOS.
2021-11-05 08:24:22 +01:00
github-actions[bot]
3567177949
Merge staging-next into staging 2021-11-03 18:10:58 +00:00
Robert Hensing
455e7f19d0
Merge pull request #144052 from hercules-ci/improve-trivial-builders-test
test.trivial-builders: Add test cases, fix test runner, rename
2021-11-03 18:10:42 +01:00
Alyssa Ross
703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Lassulus
33f0c518f7
Merge pull request #143629 from sternenseemann/writers-fixes
writers: fix writeHaskell* for darwin, bintools-related cleanup
2021-11-02 20:21:00 +01:00
Felix Buehler
e601787f7e buildOcaml: rename name to pname 2021-11-01 16:19:30 +01:00
github-actions[bot]
9e9ee310f8
Merge staging-next into staging 2021-11-01 12:01:37 +00:00
github-actions[bot]
cc41bb5851
Merge master into staging-next 2021-11-01 12:01:00 +00:00
IvarWithoutBones
af339c5cf8 buildDotnetModule: add support for running unit tests 2021-11-01 02:06:54 +01:00
Robert Hensing
51f7c15df9 test.trivial-builders: Add test cases, fix test runner, rename
The writeStringReferencesToFile didn't handle non-unique references
to the same path correctly.
2021-11-01 00:06:03 +01:00
github-actions[bot]
9a002bac35
Merge staging-next into staging 2021-10-29 18:01:38 +00:00
github-actions[bot]
6317a19147
Merge master into staging-next 2021-10-29 18:01:00 +00:00
IvarWithoutBones
bc193f80c4 buildDotnetModule: create nuget source seperately && use stdenvNoCC 2021-10-29 08:27:51 -07:00
Sandro
31b495592f
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version 2021-10-29 16:42:01 +02:00
sternenseemann
b1197ac729 writers: run fixupPhase for darwin bin writers
mach-o executables we produce in writers are not always fully valid for
some reason. In normal derivation this is fixed in fixupPhase and we can
replicate this behavior here easily.

Resolves #132660.
2021-10-29 12:34:48 +02:00
sternenseemann
3090ed3f40 writers: use platform's default strip
bintools points to the default bintools (e. g. cctools, binutils,
llvmPackages.bintools) for the next stage. So instead of using GNU
binutils' strip which may not support the current platform, we need to
use buildPackages.bintools-unwrapped.

Additionally we need to use `-S` over `--strip-unneeded` as the latter
is a GNU binutils-specific flag and not supported by cctools.

Also add the correct targetPrefix in order to support cross-compilation
correctly here at least.
2021-10-29 12:18:58 +02:00
github-actions[bot]
37b1afa489
Merge staging-next into staging 2021-10-28 18:02:03 +00:00
Martin Weinelt
da1f248229 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-28 19:51:45 +02:00
Yureka
842a0d94cb fetchYarnDeps: use fakeSha256 if no hash is given 2021-10-29 02:43:42 +09:00
Yureka
1565ab9717 prefetch-yarn-deps: ignore file: dependencies 2021-10-29 02:43:42 +09:00
Yureka
6c99b3d0b7 prefetch-yarn-deps: support git:// dependencies 2021-10-29 02:43:42 +09:00
Alyssa Ross
3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
Sandro Jäckel
db44b28a06
appimage: support pname+version for wrapType2 2021-10-28 15:21:32 +02:00
github-actions[bot]
ea4da560ff
Merge master into staging-next 2021-10-28 12:01:32 +00:00
talyz
aa22fa9c0b trivial-builders: Add writeStringReferencesToFile
Add writeStringReferencesToFile, a builder which extracts a string's
references to derivations and paths and writes them to a text file,
removing the input string itself from the dependency graph. This is
useful when you want to make a derivation depend on the string's
references, but not its content (to avoid unnecessary rebuilds, for
example).
2021-10-28 12:55:01 +02:00
github-actions[bot]
a1e570b43e
Merge master into staging-next 2021-10-28 00:01:36 +00:00
Christian Kögler
9bf244964d runInLinuxImage: Add missing backing format 2021-10-28 00:05:27 +02:00
Christian Kögler
0625121793 buildInDebian: fix test 2021-10-28 00:03:27 +02:00
Kerstin Humm
5df2d4d345
default-crate-overrides: remove two crates that are probably irrelevant 2021-10-27 22:29:10 +02:00
Kerstin Humm
f1bacf5b07 default-crate-overrides: expat-sys, glib-sys, libudev-sys, sdl2-sys, servo-fontconfig, skia-bindings 2021-10-28 03:07:33 +09:00
github-actions[bot]
22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
Ryan Burns
f67d4dd9c1
Merge pull request #142616 from r-burns/toplevel-system
treewide: remove toplevel `system` attr
2021-10-27 10:03:24 -07:00
figsoda
5a08a28803 rustPlatform: add support for features 2021-10-27 08:08:03 -04:00
bb010g
a1ed62e586 releaseTools.antBuild: remove
The sole consumer in Nixpkgs of `releaseTools.antBuild` is
`pkgs/development/libraries/junit`, which has been broken since
2015-09-08. The sole consumer in Nixpkgs of `junit` is
`pkgs/development/libraries/junixsocket`, which hasn't built due to
`junit` since 2015-09-08. All three are removed due to their obvious
lack of use.

All other packages in Nixpkgs depending on junit consume
`pkgs/development/java-modules/junit`, which is not broken.

Any downstreams that have kept using these `junit` or `junixsocket`
packages since 2015-09-08 have basically already vendored the packages
via patching them, so no aliases are provided.
2021-10-27 13:21:27 +03:00
bb010g
29fedf210f canonicalize-jars-hook: add
A build hook to run functions previously only implemented privately in
`pkgs/build-support/release/functions.sh`.
2021-10-27 13:21:27 +03:00
Dmitry Kalinkin
777a4ba508
singularity-tools.buildImage: fix building from non-standard store paths 2021-10-27 02:11:44 -04:00
github-actions[bot]
a16b1b54b3
Merge staging-next into staging 2021-10-25 12:02:08 +00:00
github-actions[bot]
0336295c41
Merge master into staging-next 2021-10-25 12:01:31 +00:00
Robert Hensing
8ecfaf3543 dockerTools: Fix test 2021-10-25 12:25:01 +02:00
Artturi
44403b728b
patchutils: add 0.4.2 variant + remove meta.executable + enable tests + fix inter-dependencies by wrapping (#141567) 2021-10-25 13:13:22 +03:00
Pavol Rusnak
8e18c70837
Merge pull request #142218 from IvarWithoutBones/use/nbxporer-buildDotnetModule
{btcpayserver,nbxplorer}: use buildDotnetModule
2021-10-25 10:21:49 +02:00
Stefan Junker
445510ed69 rust/import-cargo-lock: hopefully make nested crate test work on macos 2021-10-25 01:11:45 +02:00
IvarWithoutBones
26cf7887b5 buildDotnetModule: fix variable handling 2021-10-25 00:24:09 +02:00
Stefan Junker
f9a340a916 rust/import-cargo-lock: add test git-dependency-rev-non-workspace-nested-crate 2021-10-24 20:27:42 +02:00
John Ericson
e2eccfc521
Merge pull request #141072 from r-burns/validatepkgconfig-cross
[staging] validatePkgConfig: fix cross-compilation
2021-10-23 23:09:42 -04:00
Stefan Junker
b2aa19efe7 rust: find nested packages in git repositories
this mimics the heuristic cargo uses for finding crates in their git
repositories ([cargo-issue-1462]).

[cargo-issue-1462]: https://github.com/rust-lang/cargo/issues/1462
2021-10-24 01:52:44 +02:00
Ryan Burns
9fb1f66d30 validatePkgConfig: fix cross-compilation
Fixes cross-compilation for duktape and pugixml
2021-10-23 15:50:21 -07:00
github-actions[bot]
c3a27b2a6c
Merge staging-next into staging 2021-10-23 18:01:53 +00:00
github-actions[bot]
50a5d0f17c
Merge master into staging-next 2021-10-23 18:01:15 +00:00
Yuka
49a5b293b9
prefetch-yarn-deps: add nix dependency (#142664)
fixes "Error: spawn nix-hash ENOENT"
2021-10-23 19:13:34 +02:00
Ryan Burns
aed6bb336e build-support/docker: remove toplevel system attr 2021-10-22 14:04:05 -07:00
github-actions[bot]
f9ab4de694
Merge staging-next into staging 2021-10-22 18:01:54 +00:00
Jonathan Ringer
fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
Silvan Mosberger
98f82e9c35
Merge pull request #141789 from pennae/eval-opt
lib: make extendDerivation lighter on eval
2021-10-21 20:17:32 +02:00
Pavol Rusnak
e32dde36b0
Merge pull request #138033 from mikepurvis/allow-gitlab-protocol-override
Allow overriding fetchFromGitLab protocol.
2021-10-21 18:12:47 +02:00
github-actions[bot]
eebbebca41
Merge staging-next into staging 2021-10-20 12:02:09 +00:00
github-actions[bot]
cdc8393c04
Merge master into staging-next 2021-10-20 12:01:31 +00:00
Yureka
84e02be598 fetchYarnDeps, mkYarnModules: verify the FOD hash is up-to-date 2021-10-20 11:39:16 +02:00
Yureka
d6e0195ccd prefetch-yarn-deps, fetchYarnDeps: init 2021-10-20 11:39:16 +02:00
github-actions[bot]
413d93fade
Merge staging-next into staging 2021-10-20 06:01:49 +00:00
github-actions[bot]
2d8f645c79
Merge master into staging-next 2021-10-20 06:01:15 +00:00
figsoda
5f33ded601
Merge pull request #142154 from figsoda/cargo-hash-default-null
buildRustPackage,fetchCargoTarball: accept empty hashes
2021-10-19 22:41:58 -04:00
figsoda
f441e6b7f4 buildRustPackage,fetchCargoTarball: accept empty hashes 2021-10-19 20:56:46 -04:00
figsoda
836e6d3e02 buildRustPackage: remove unused arguments, minor styling changes 2021-10-19 20:11:28 -04:00
github-actions[bot]
2564b3d967
Merge staging-next into staging 2021-10-19 18:01:48 +00:00
Vladimír Čunát
01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Tobias Bergkvist
1218b82bce Move assertExecutable from makeCWrapper to makeBinaryWrapper to ensure that makeCWrapper is a pure function 2021-10-19 14:37:05 +02:00
Doron Behar
c310cb0d94 makeBinaryWrapper: add wrapProgramBinary (like wrapProgram) 2021-10-19 05:30:42 -07:00
Doron Behar
a45c5db391 makeBinaryWrapper: Assert $1 is executable 2021-10-19 05:30:42 -07:00
Manuel Bärenz
7a135abf60
Merge pull request #98214 from turion/dev_test_all_agda_packages
Fix #98209. Test all agda packages
2021-10-19 09:56:50 +02:00
Pavol Rusnak
d31c9bd3f0
Merge pull request #139571 from prusnak/dotnet-cleanup
dotnet: cleanup; point dotnet-sdk alias to 5.0; remove unsupported SDKs
2021-10-19 09:16:11 +02:00