Commit graph

5056 commits

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