nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
269,503 Commits 339 Branches 124 Tags 7.2 GiB
d083f412fa
Commit Graph

4251 Commits

Author SHA1 Message Date
Jörg Thalheim
1df84d17b9
Merge pull request #103755 from hlolli/feature/fetchmaven-classifiers 2020-12-06 08:37:15 +00:00
hlolli
38ad378228
add classifier as an argument 2020-12-05 18:56:46 +01:00
github-actions[bot]
899d916e1d
Merge staging-next into staging 2020-12-05 12:18:20 +00:00
github-actions[bot]
0947539ec1
Merge master into staging-next 2020-12-05 12:18:17 +00:00
Arnout Engelen
777cb35eb8
compress-man-pages: symlink compressed manpages deterministically 
For example graphviz has chained symlinked manpages: dot2gxl.1 is
a symlink to gv2gxl.1 which is a symlink to gxl2gv.1

The second loop replaces each non-compressed symlink to a compressed
symlink. The target is determined with 'readlink -f', which follows
links recursively until the first name that is not a link (so either
the 'target name' or the first 'dangling' symlink).

This means that if the loop converted dot2gxl.1 before converting
gv2gxl.1 it would add a symlink `dot2gxl.1.gz->gxl2gv.1.gz`. When
it converted gv2gxl.1 first, it would then add a
`dot2gxl.1.gz->gv2gxl.1.gz` symlink.

Both are 'correct', but it's weird the result depends on the order
in which 'find' returns the files. This PR makes the behaviour
deterministic.

fixes #104708
 2020-12-04 09:24:37 +01:00
Luke Granger-Brown
1f6d750097 fetchzip: get write permission on unpacked directory 
This is a workaround for NixOS/nix#4295, which caused single-user Linux
Nix installations using sandboxed builds to start failing to build
fetchzip derivations after 4a5c49363a.

In short: removing write permissions for the entire directory is great,
except we then can't rename(2) it to the final Nix store path out of the
sandbox, because we don't have write permission on the directory and
thus cannot update the ".." directory entry.
 2020-12-04 03:28:00 +00:00
github-actions[bot]
03619d4f2b
Merge staging-next into staging 2020-12-03 12:18:48 +00:00
github-actions[bot]
5b73e3087a
Merge master into staging-next 2020-12-03 12:18:45 +00:00
Daniël de Kok
e87d457564 buildRustCrate: set NUM_JOBS to NIX_BUILD_CORES 
Bofore this change, NUM_JOBS was set to 1. Some crates for building
C/C++ code (e.g. the cc and cmake crates), rely on this variable to
set the number of jobs. As a consequence, we were compiling embedded
libraries serially. Change this to NIX_BUILD_CORES to permit parallel
builds.

Prior discussion:

https://github.com/NixOS/nixpkgs/pull/50452#issuecomment-439407547
 2020-12-03 12:44:12 +01:00
Frederik Rietdijk
c7843cf6a2
Merge pull request #101142 from DavHau/improve-autopatchelf 
autoPatchelfHook: optimize performance; better error handling
 2020-12-03 12:34:05 +01:00
Jörg Thalheim
3cd6bc103d
Merge branch 'master' into firefox-nix-addon-support 2020-12-03 07:20:16 +00:00
github-actions[bot]
58274c4f8d
Merge master into staging-next 2020-12-03 00:36:28 +00:00
Florian Klink
7a34bcc2a3
Merge pull request #105685 from flokli/dockertools-fakenss 
dockerTools.fakeNss: init
 2020-12-02 23:34:46 +01:00
github-actions[bot]
d3f5608624
Merge master into staging-next 2020-12-02 18:13:34 +00:00
John Ericson
8e21ce5fae
Merge pull request #105294 from Ericson2314/platform-config-improvements 
Platform config improvements
 2020-12-02 11:17:41 -05:00
Florian Klink
e054694925 dockerTools.binSh: init 2020-12-02 14:57:23 +01:00
Florian Klink
f7ee2706c2 dockerTools.fakeNss: init 
This provides a /etc/passwd and /etc/group that contain root and nobody.

Useful when packaging binaries that insist on using nss to look up
username/groups (like nginx).

The current nginx example used the `runAsRoot` parameter to setup
/etc/group and /etc/passwd (which also doesn't exist in
buildLayeredImage), so we can now just use fakeNss there and use
buildLayeredImage.
 2020-12-02 14:56:07 +01:00
github-actions[bot]
89e8bf0f2a
Merge master into staging-next 2020-12-02 12:30:55 +00:00
Jörg Thalheim
9712bbdf74
firefoxaddon: formatting nitpicks 2020-12-02 09:53:53 +01:00
Luis Hebendanz
5f8eca5461
Added missing sha1 and sha512 flags 2020-12-02 09:40:53 +01:00
Luis Hebendanz
397597f731
Added fetchfirefoxaddon 2020-12-02 09:40:53 +01:00
edef
de88771a7d nix-prefetch-docker: output informational messages to stderr 
Informational messages belong on stderr, not on stdout and intermixed
with structured output for programmatic use.

Change-Id: I34d094d04460494e9ec8953db7490f4e2292d959
 2020-12-01 16:58:29 +00:00
Jan Tojnar
27b974d84b
Merge branch 'staging-next' into staging 2020-12-01 03:26:36 +01:00
Frederik Rietdijk
9a63b3d3d6
Merge pull request #104781 from NixOS/staging-next 
Staging next
 2020-11-30 18:27:29 +01:00
John Ericson
77816426b6
Merge pull request #105305 from lopsided98/build-rust-crate-platform-hash 
buildRustCrate: add host platform to rlib hash suffix
 2020-11-29 10:50:25 -05:00
Frederik Rietdijk
05d1c49209 Merge staging-next into staging 2020-11-29 13:51:33 +01:00
Frederik Rietdijk
0d8491cb2b Merge master into staging-next 2020-11-29 13:51:10 +01:00
Ben Wolsieffer
8c479059b9 buildRustCrate: add host platform to rlib hash suffix 2020-11-28 22:25:11 -05:00
Fabian Möller
50f54c5ca7 copyDesktopItems: add new setup-hook 2020-11-29 04:03:38 +01:00
John Ericson
73425f6c3b Merge remote-tracking branch 'upstream/master' into staging 2020-11-28 21:33:03 -05:00
Benjamin Hipple
9426084fec
Merge pull request #102114 from MetaDark/fetchzip 
fetchzip: remove write permissions for unpacked files
 2020-11-28 19:18:14 -05:00
John Ericson
04f6973200 lib, binutils: Move Risc-V bfdEmulation to be by the others 2020-11-29 00:03:51 +00:00
John Ericson
8ddf5c6907 Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target 2020-11-28 18:10:38 +00:00
John Ericson
c6617d28ef Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target 2020-11-28 17:09:12 +00:00
Jan Tojnar
136152af80
Merge pull request #101537 from jtojnar/gtk-tracker 2020-11-28 01:37:37 +01:00
Frederik Rietdijk
b2a3891e12 Merge master into staging-next 2020-11-27 15:09:19 +01:00
Florian Klink
ae5764621d make-desktopitem: desktop-file-utils is a nativeBuildInput 
This fixes cross-compilation of a NixOS with the manual enabled.
 2020-11-27 01:17:32 +01:00
Sandro
3819fb300b
Merge pull request #101542 from wahjava/fix/fetchfossil 
fetchfossil: Depend on cacert
 2020-11-27 00:15:29 +01:00
MetaDark
4a5c49363a fetchzip: remove write permissions for unpacked files 
Fixes https://github.com/NixOS/nixpkgs/issues/38649
 2020-11-26 15:30:12 -05:00
Jan Tojnar
acfc45bacc
wrapGAppsNoGuiHook: init 2020-11-26 14:06:07 +01:00
Ryan Burns
9682c1d0da linux bootstrap tools: fix tests on ppc64 
The dynamic loader on powerpc64 is called ld64.so.2 rather than
ld-linux.so.*, and was not matched by the existing pattern.

We reuse the dynamicLinker name from binutils to match a wider set
of platforms and to avoid specifying this information in two places.
 2020-11-24 18:32:12 -08:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Jörg Thalheim
79086e5d55
Merge pull request #104769 from symphorien/appimage-run-locale 
appimage-run: parse readelf's output in C locale
 2020-11-24 15:39:35 +01:00
Symphorien Gibol
4d51f95638 appimage-run: parse readelf's output in C locale 
fixes #101137
 2020-11-24 13:55:04 +01:00
Jan Tojnar
6d99109b12
Merge branch 'staging-next' into staging 2020-11-24 05:44:44 +01:00
adisbladis
6847a5c12d
referencesByPopularity: Don't use buildPackages at call-site 
It's cleaner to reference buildPackages directly in
build-support/docker directly.
 2020-11-24 02:55:40 +01:00
Frederik Rietdijk
587538d087 Merge staging-next into staging 2020-11-23 18:10:33 +01:00
Kevin Cox
272744825d
Merge pull request #98325 from Atemu/fhsenv-bw-bash-lists 
buildFHSUserEnvBubblewrap: use arrays for constructing argument list
 2020-11-22 14:04:20 -05:00
Atemu
74c4a55e10 buildFHSUserEnvBubblewrap: use arrays for constructing argument list 
Generally a cleaner way of doing it and prevents issues with spaces in paths

Used to fix #97234 but #101967 already didt this with a smaller scope
 2020-11-22 19:26:59 +01:00
Frederik Rietdijk
54cb417ba0 Merge staging-next into staging 2020-11-21 08:43:46 +01:00
Frederik Rietdijk
1ffd7cf0d6 Merge master into staging-next 2020-11-21 08:43:10 +01:00
adisbladis
b7b22c5814
dockerTools: Always cross compile for another arch in the cross example 
The example fails to build on aarch64, so lets cross build for gnu64.
 2020-11-20 12:57:58 +01:00
Jan Tojnar
66ef389efa
Merge branch 'staging-next' into staging 2020-11-20 01:38:58 +01:00
Jan Tojnar
f6105d21e3
Merge branch 'master' into staging-next 2020-11-20 01:38:32 +01:00
adisbladis
5357abf49a
dockerTools: Add cross example 2020-11-19 18:13:21 +01:00
adisbladis
8a3b33baed
dockerTools: Set correct architecture when cross compiling 2020-11-19 18:13:21 +01:00
adisbladis
4313ac6b29
dockerTools.buildLayeredImage: Fix cross compilation 2020-11-19 14:32:22 +01:00
Andreas Rammhold
278b273d9a
Merge pull request #102251 from andir/random-seed 
stdenv: introduce -frandom-seed
 2020-11-19 01:07:28 +01:00
Frederik Rietdijk
da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
Frederik Rietdijk
986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
John Ericson
86fedc3a92
Merge pull request #102766 from siraben/mmix 
Initial implementation of cross-compilation to Knuth's MMIX
 2020-11-14 12:46:24 -05:00
hlolli
49c789703c
fetchMavenArtifact: support artifact classifier syntax 2020-11-14 00:55:44 +01:00
zowoq
473b341fb1 bintools-wrapper: remove redundant arg 
cctools 949.0.1 warns if min version is passed twice.
 2020-11-14 07:11:29 +10:00
Samuel Dionne-Riel
6d8327ea96 Initial support for OpenRISC 1000 (or1k) 2020-11-09 22:32:11 -05:00
Ben Siraphob
445dde6304 Initial implementation of mmix cross-compile 2020-11-09 19:49:55 +07:00
Samuel Gräfenstein
0950c98059 docker: add final newline to detjson.py 2020-11-09 11:39:28 +00:00
Samuel Gräfenstein
22b73d1282 pkgs/*: add final newline to .nix files 2020-11-09 11:39:28 +00:00
DavHau
05fa0f1a2e improve things shellcheck complains about 2020-11-07 18:08:48 +07:00
Robert Hensing
06df74607f
Merge pull request #101403 from mickours 
Fix broken pipe error on docker layer creation
 2020-11-05 00:17:36 +01:00
Michael
24c5059468 docker: Fix broken pipe on docker layer creation 
Add `-p` to the `tee` command to avoid exiting on breaking pipe due to
tarsum finishing before tar which creating docker layers.
 2020-11-03 12:33:11 +01:00
Andreas Rammhold
83f0bccc89 stdenv: add -frandom-seed to NIX_CFLAGS_COMPILE for reproducibility 
This adds -frandom-seed to each compiler invocation in stdenv. The
object here is to make the compierl invocations produce the same output
every time they are called (for the same derivation). When the
-frandom-seed option is not set the compiler will use a combination of
random numbers (in GCC's case from /dev/urandom) and the durrent time to
produce a "random" input per file. This can (among other things) lead to
different ordering of symbols in the produced object files.

For reason of reproducibility we prefer having the same derivation
produce the exact same outputs. This is not a silver bullet but one way
to tame the compiler.
 2020-11-01 19:40:12 +01:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Jonathan Ringer
ec38df81a9 buildFHSUserEnvBubblewrap: fix whitespace with root directories 2020-10-30 22:52:58 -07:00
Matthew Bauer
989b403c7f
Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv 
stdenv/native: provide patchelf on linux
 2020-10-30 13:32:13 -05:00
Jörg Thalheim
d420c85a55
Merge pull request #102123 from lopsided98/nginx-conf-cross 
writers.writeNginxConfig: fix cross-compilation
 2020-10-30 12:45:04 +01:00
Ben Wolsieffer
4366281075 writers.writeNginxConfig: fix cross-compilation 
Native versions of awk, sed and gixy need to be used.
 2020-10-29 21:39:22 -04:00
Matthieu Coudron
1f9ab74d4c buildBazelPackage: build name from pname/version 
and updated bazel-remote accordingly.
 2020-10-28 17:55:10 +01:00
DavHau
112f275f4d
autoPatchelfHook: fix typos in comments 2020-10-26 17:17:07 +07:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
Ashish SHUKLA
4eb42a4f1d
fetchfossil: Depend on cacert 
Without it, it'll not able to verify SSL certificates, rendering
it mostly useless
 2020-10-24 16:43:05 +05:30
DavHau
b9d2541a37
autoPatchelfHook: store dependant for dependency 2020-10-23 13:21:08 +07:00
DavHau
f833f0406f
autoPatchelfHook: print dependant for missing deps 2020-10-23 13:16:23 +07:00
DavHau
11a08bcfad
Apply suggestions from code review 
Co-authored-by: symphorien <symphorien@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2020-10-22 10:15:42 +07:00
Symphorien Gibol
a5a383a389 nix-gitignore: filter-out .git 2020-10-21 12:00:00 +00:00
Frederik Rietdijk
23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
DavHau
5c382b7f0e autoPatchelfHook: optimize performance, better error handling 2020-10-20 19:09:32 +07:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Daniël de Kok
48a20e9337 validatePkgConfig: fix variable scope 
validatePkgConfig failed due to a wrong variable scope, as reported in
issue #100834. This change corrects the variable scoping.
 2020-10-18 14:00:05 +02:00
Aaron Janse
512458c68a add sysroot lockfile update script then run it 2020-10-17 01:34:51 -07:00
Aaron Janse
d884b2d877 NEEDS REVIEW: enable sysroot differently 2020-10-17 00:48:38 -07:00
Aaron Janse
7c92361028 enforce noCheck when useSysroot 2020-10-17 00:47:14 -07:00
Aaron Janse
dec97eb3e9 minor clean up 2020-10-17 00:45:27 -07:00
Aaron Janse
e745f9333e fix whitespace 2020-10-15 19:03:10 -07:00
Aaron Janse
d906fda8d2 parameterize rustcSrc 2020-10-15 17:27:51 -07:00
Leon Vack
f275b320d9
make-desktopitem: name was being used instead of desktopName 
Name should be used as filename and desktopName for the name attribute of the desktop entry (according to docs).
 2020-10-15 14:29:32 +02:00
Aaron Janse
a153be896f use rustcSrc 2020-10-14 22:54:04 -07:00
maralorn
ae2630c96a
Merge pull request #91790 from piegamesde/improve-makedesktopitem 
make-desktopitem: refactoring, documentation and improvement
 2020-10-15 02:42:12 +02:00
John Ericson
c0df12de5d rust: Add support for managing target JSON in Nix 2020-10-14 04:20:23 +00:00
John Ericson
6866f26c89 Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target 2020-10-14 02:54:31 +00:00
piegames
3a76d4caea make-desktopitem: minor fixes and code style 2020-10-14 01:19:43 +02:00
Frederik Rietdijk
dc0aeee5db Merge staging-next into staging 2020-10-13 19:35:37 +02:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Aaron Janse
3f3491d64d fix some whitespace 2020-10-12 18:41:13 -07:00
Aaron Janse
0fca6ba580 fix compile error 2020-10-12 14:48:07 -07:00
John Ericson
d3d55bcc81
Merge pull request #99066 from lopsided98/buildrustcrate-target-vars 
buildRustCrate: fix target config environment variables on 32-bit ARM
 2020-10-11 16:46:29 -04:00
Lily Ballard
03c9f6a647 installShellFiles: Add test suite 2020-10-08 15:08:40 -07:00
Lily Ballard
866a7de409 Fix doc comment for installManPage 2020-10-08 15:08:40 -07:00
Lily Ballard
7e1e8543fc installShellFiles: Enhance installShellCompletion 
Teach installShellCompletion how to install completions from a named
pipe. Also add a convenience flag `--cmd NAME` that synthesizes the name
for each completion instead of requiring repeated `--name` flags.

Usage looks something like

    installShellCompletion --cmd foobar \
      --bash <($out/bin/foobar --bash-completion) \
      --fish <($out/bin/foobar --fish-completion) \
      --zsh <($out/bin/foobar --zsh-completion)

Fixes #83284
 2020-10-08 15:08:40 -07:00
Aaron Janse
f8ea4e0c3d makeRustPlatform: support custom targets 2020-10-08 14:32:49 -07:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Ben Wolsieffer
91bc6128b9 buildRustCrateTests: support cross-compilation 2020-09-29 14:33:49 -04:00
Ben Wolsieffer
f0fdecfbb4 buildRustCrate: fix target config environment variables on 32-bit ARM 2020-09-29 01:40:06 -04:00
John Ericson
cffc0eaa98
Merge pull request #99050 from lopsided98/buildrustcrate-cross 
buildRustCrate: support cross compilation
 2020-09-29 00:13:26 -04:00
Ben Wolsieffer
a0e7613509 defaultCrateOverrides: move pkgconfig to nativeBuildInputs 
This fixes cross-compiling.
 2020-09-28 19:47:52 -04:00
Ben Wolsieffer
295a6690f9 buildRustCrate: support cross compilation 2020-09-28 19:46:04 -04:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Vladimír Čunát
a8cda11090
Merge #97597: stdenv wrappers: improve purity checking 2020-09-24 10:58:10 +02:00
zowoq
e4c71e6c6c buildRustPackage: support setting test-threads 2020-09-24 07:19:58 +10:00
Shea Levy
b694eb6e6a
firmware-manager: Init at 0.1.1 2020-09-23 06:01:05 -04:00
WORLDofPEACE
978e419abe Merge branch 'staging-next' into staging 2020-09-20 18:43:38 -04:00
WORLDofPEACE
34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
zowoq
4482e5ec2c dotnetenv: editorconfig fixes 2020-09-21 08:30:58 +10:00
Lars Jellema
7ea5b08cfc gnat: fix build 2020-09-19 20:54:27 -07:00
Anderson Torres
6740a5998b
Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy 
singularity-tools: Check for /bin/sh existence before symlink
 2020-09-19 00:42:29 -03:00
Vladimír Čunát
372f89cc44
Merge branch 'master' into staging-next 2020-09-16 17:58:45 +02:00
Anderson Torres
a5931fa6e3
Merge pull request #95409 from utdemir/stream_layered_image_fix 
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
 2020-09-14 11:05:48 -03:00
WORLDofPEACE
4085eee678
Merge pull request #97801 from rycee/user-session-dbus2 
Make socket activated user dbus session mandatory
 2020-09-14 00:37:09 -04:00
WORLDofPEACE
f5fdc6b240
Merge pull request #97894 from TethysSvensson/fixBusybox 
busybox: Fix 404 error by using git instead
 2020-09-13 14:25:22 -04:00
Tethys Svensson
43cd431b44 fetchgitlab: Escape a few more characters in the revision 2020-09-13 12:34:08 +02:00
Maximilian Bosch
25e60944c6
python3Packages.python-engineio: fix build w/glibc-2.32 
Also had to wrap `__nss_files_fopen` in `libredirect` as this is the way
now `nss` uses to retrieve file-databases[1].

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=299210c1fa67e2dfb564475986fce11cd33db9ad;hp=469c03907b116c37c98d8ad7a9edac2bdbf3e934
 2020-09-12 23:04:50 +02:00
Robert Helgesson
fbc5093649
hooks: add moveSystemdUserUnitsHook 
This hook moves systemd user service file from `lib/systemd/user` to
`share/systemd/user`. This is to allow systemd to find the user
services when installed into a user profile. The `lib/systemd/user`
path does not work since `lib` is not in `XDG_DATA_DIRS`.
 2020-09-12 18:29:46 +02:00
Vladimír Čunát
e88e14ec8d
Merge branch 'master' into staging-next 
A few thousand rebuilds per platform have arrived in the meantime.
 2020-09-11 14:24:13 +02:00
Tyson Whitehead
5796715bb7
Accept $TMP, $TMPDIR, $TEMP, and $TEMPDIR paths in purity check 2020-09-10 12:39:08 -04:00
John Ericson
5fd27509cf
Merge pull request #97387 from Ericson2314/fix-android-prebuilt 
cc-wrapper: Fix for prebuilt android
 2020-09-08 20:24:50 -04:00
John Ericson
204dc3a88b cc-wrapper: Fix for prebuilt android 
We don't want to use Nix-built GCC's libs with prebuilt clang in this
case.
 2020-09-07 15:08:11 -04:00
Dominik Xaver Hörl
b20ec4f719 pkgs/build-support/writers: allow passing ghc arguments in writeHaskell 2020-09-07 19:36:58 +02:00
Frederik Rietdijk
5ceea5705a Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper" 
Follow up to the revert in e560459c5b.

This reverts commit 1936b11f63.
 2020-09-07 16:31:59 +02:00
Frederik Rietdijk
be61518b91 Merge staging-next into staging 2020-09-07 16:31:37 +02:00
Frederik Rietdijk
1936b11f63 utils.bash: also "fix" cc-wrapper and pkg-config-wrapper 2020-09-07 07:19:26 +02:00
Frederik Rietdijk
e560459c5b Revert "utils.bash: revert #93560 for darwin, unblocks channels" 
Revert the hack and the original faulty commit.

This reverts commit 48264ee506.

Revert "Purity checking should accept $TMP and not just /tmp"

This reverts commit fb777be7d2.
 2020-09-06 18:16:14 +02:00
Frederik Rietdijk
1d881848f8 Merge staging-next into staging 2020-09-06 18:15:07 +02:00
Frederik Rietdijk
d362c0e54e Merge master into staging-next 2020-09-06 18:14:23 +02:00
Frederik Rietdijk
08eb704bc3 utils.bash: revert #93560 for darwin, unblocks channels 
Temporary fix. We definitely do not want to have two separate
implementations.
 2020-09-06 18:14:08 +02:00
Evan Stoll
19cb34b04b
buildSupport.rust: fix typo in verifyCargoDeps message (#97058) 2020-09-05 17:04:32 -04:00
Florian Klink
98d6b55fdc nixos/testing: remove remaining coverage-data logic 
This isn't used anymore as per
https://github.com/NixOS/nixpkgs/pull/72354#discussion_r451031449.
 2020-09-05 16:07:59 +02:00
Frederik Rietdijk
af81d39b87 Merge staging-next into staging 2020-09-04 20:03:30 +02:00
Tyson Whitehead
fb777be7d2 Purity checking should accept $TMP and not just /tmp 2020-09-04 19:58:46 +02:00
Jan Tojnar
5079e1cd3b
Merge pull request #96939 from jtojnar/drop-gst-010 2020-09-04 17:13:43 +02:00
Utku Demir
ae82f81bfa
dockerTools.streamLayeredImage: Store the customisation layer as a tarball 
This fixes as issue described here[1], where permissions set by 'extraCommands'
were ignored by Nix.

[1] https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-669834938
 2020-09-04 16:53:23 +12:00
Matthew Bauer
3a9b91b486
Merge pull request #96562 from obsidiansystems/bazel-add-dont-add-bazel-opts 
build-bazel-package: add dontAddBazelOpts arg
 2020-09-02 16:29:53 -05:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd 
platform.gcc.arch: support for AMD CPUs
 2020-09-01 22:31:16 -04:00
Jan Tojnar
d2d24c9a2b
appimage: remove ancient gst dep 
it is insecure and broken
 2020-09-02 02:24:07 +02:00
Matthew Bauer
27fb209194 build-bazel-package: add dontAddBazelOpts arg 
This adds an option to skip adding --copt and --linkopt to Bazel
flags. In some cases, Bazel doesn’t like these flags, like when a
custom toolchain is being used (as opposed to the builtin one. The
compiler can still get the dependencies since it is invoked through
gcc wrapper and picks up the NIX_CFLAGS_COMPILE / NIX_LDFLAGS.
 2020-08-28 15:10:59 -05:00
Linus Heckemann
86fa61033a
Merge pull request #96008 from baloo/baloo/bugfixes/make-modules-closure_firmware 
makeModulesClosure: fixup firmware extraction
 2020-08-28 14:04:10 +02:00
Daniël de Kok
923c9f62c4 fetchCrate: accept pname besides crateName 
This enables short argument attrsets similar to fetchPypi:

src = fetchCrate {
  inherit pname version;
  sha256 = "02h8pikmk19ziqw9jgxxf7kjhnb3792vz9is446p1xfvlh4mzmyx";
};
 2020-08-28 08:34:22 +02:00
Arthur Gautier
70bc1a3f49 makeModulesClosuse: read modules from corrent kernel version 
Before this commit, the firmware information would be loaded from the
currently running kernel, not from the kernel to be loaded.

This commit ensures the correct kernel version and modules are read.
 2020-08-27 10:48:18 -07:00
Arthur Gautier
ee8572d6b3 makeModulesClosure: fixup firmware extraction 
After a recent upgrade of modinfo, its output is now incorrect for
builtin modules. This commit filters out the output until a fix is made
available upstream
 2020-08-27 10:45:23 -07:00
Matthew Bauer
4830967736 Fix cc-wrapper in native stdenv 2020-08-26 14:36:26 -05:00
Jan Tojnar
58377555ed
Merge branch 'staging-next' into staging 2020-08-23 02:18:27 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00
Jörg Thalheim
542f4e4ad0
Merge pull request #95622 from marsam/buildrustpackage-parallel-build 
buildRustPackage: add support for parallel build
 2020-08-19 17:33:46 +01:00
Jörg Thalheim
bd0e645f02
Merge pull request #94442 from Atemu/buildFHSUserEnvBw 2020-08-19 17:28:02 +01:00
Frederik Rietdijk
0ac85bc455 Merge master into staging-next 2020-08-17 14:54:39 +02:00
Jörg Thalheim
b1d86d0e51 build-fhs-user-env-bubblewrap: consistent camelCase 2020-08-17 10:05:25 +02:00
Michael Eden
8c91b3c5b7 fhs-userenv-bubblewrap: bind mount host's devfs 
Allows us to talk to devices
 2020-08-17 08:49:34 +02:00
Michael Eden
2da4f24e22 fhs-userenv-bubblewrap: bind mount parts of host etc directly 2020-08-17 08:49:29 +02:00
Michael Eden
2ddb43ec24 fhs-userenv-bubblewrap: change to using bubblewrap over chrootenv 2020-08-17 08:49:24 +02:00
Atemu
fafbfd2305 fhs-userenv-bubblewrap: start with build-fhs-userenv 
Just here to track @illegalprime's actual changes to build-fhs-userenv in the
next commits
 2020-08-17 08:48:31 +02:00
Mario Rodas
b52808f1ad
buildRustPackage: add support for parallel build 2020-08-16 10:00:00 -05:00
Vladimír Čunát
3937923f81
nixos/systemd.tmpfiles.packages: fix an edge case 
symlinkJoin can break (silently) when the passed paths contain symlinks
to directories.  This should work now.

Down-side: when lib/tmpfiles.d doesn't exist for some passed package,
the error message is a little less explicit, because we never get
to the postBuild phase (and symlinkJoin doesn't provide a better way):
/nix/store/HASH-NAME/lib/tmpfiles.d: No such file or directory

Also, it seemed pointless to create symlinks for whole package trees
and using only a part of the result (usually very small part).
 2020-08-16 10:23:53 +02:00
Frederik Rietdijk
cfe6081cee Merge staging-next into staging 2020-08-15 09:12:42 +02:00
Frederik Rietdijk
d59c57f8a6
Merge pull request #92412 from matthewbauer/blas-cross 
Blas/Lapack cross fixes
 2020-08-15 08:55:57 +02:00
Jörg Thalheim
1f2c19f158
Merge pull request #68524 from nspin/pr/repo-manifest-name 
fetchRepoProject: add manifestName parameter
 2020-08-14 20:08:25 +01:00
Linus Heckemann
efc739f1d2
Merge pull request #92081 from CrystalGamma/modules-closure 
makeModulesClosure: handle builtin modules better
 2020-08-13 22:37:36 +02:00
Frederik Rietdijk
f707715136 Merge master into staging-next 2020-08-11 10:26:35 +02:00
zowoq
1439eaf07b buildRustCrate: editorconfig fixes 2020-08-09 17:47:12 +10:00
volth
cf7b63df5b gcc.arch: refactor, move tables under lib/ 2020-08-05 11:18:26 +00:00
volth
463db72e63 platform.gcc.arch: support for AMD CPUs 2020-08-05 02:32:48 +00:00
John Ericson
b5f7ed6846
Merge pull request #91293 from Ericson2314/cxx-wrapper-debt-part-2 
treewide: Get rid of `cc.gcc`
 2020-08-02 20:42:20 -04:00
John Ericson
92f96f47b0 treewide: Get rid of cc.gcc 
Instead, we have a new `gccForLibs`, which has the appropriate
definition for e.g. avoiding `x86_32` linking problems.
 2020-08-02 17:12:05 +00:00
Frederik Rietdijk
50c060d13d Merge master into staging-next 2020-08-01 19:37:20 +02:00
Johan Thomsen
f5db415e2f nixos/tests/dockerTools: add test for running non-root containers with buildLayeredImage 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2020-07-31 10:14:07 +02:00
Johan Thomsen
9f86685cc7 dockerTools: fix permissions on /nix/store 2020-07-30 16:20:50 +02:00
Vladimír Čunát
60d89e5793
Merge branch 'master' into staging 2020-07-29 18:40:28 +02:00
John Ericson
cd719c1eae
Merge pull request #91974 from Mic92/nostdinc 
stdenv: make -nostdinc work as intended
 2020-07-28 19:49:42 -04:00
Jan Tojnar
d489409aaa
Merge pull request #85976 from jtojnar/wrap-gapps-hook-tests 2020-07-26 13:55:35 +02:00
Vladimír Čunát
2b7c0dcdaa
Merge branch 'staging-next' 
Rebuild on Hydra seems OK-ish.
mongodb.nix needed some conflict resolution (scons versions);
all four versions seem to build fine.
 2020-07-25 16:18:40 +02:00
Adrian
a6133b7a39
writers.makeScriptWriter: fix on Darwin\MacOS (#93757) 
* writers.makeScriptWriter: fix on Darwin\MacOS

On Darwin a script cannot be used as an interpreter in a shebang line, which
causes scripts produced with makeScriptWriter (and its derivatives) to fail at
run time if the used interpreter was wrapped with makeWrapper (as in the case
of python3.withPackages).

This commit fixes the problem by detecting if the interpreter is a script
and prepending its shebang to the final interpreter line.

For example if used interpreter is;
```
/nix/store/ynwv137n2650qy39swcflxbcygk5jwv1-python3-3.8.3-env/bin/python
```

which is a script with following shebang:
```
#! /nix/store/knd85yc7iwli8344ghav3zli8d9gril0-bash-4.4-p23/bin/bash -e
```

then the shebang line in the produced script will be
```
#! /nix/store/knd85yc7iwli8344ghav3zli8d9gril0-bash-4.4-p23/bin/bash -e /nix/store/ynwv137n2650qy39swcflxbcygk5jwv1-python3-3.8.3-env/bin/python
```

This works on Darwin since there does not seem to be a limit to the length
of the shabang line and the shebang lines support multiple arguments to
the interpreters (as opposed to linux where the kernel imposes a strict limit
on shebang lengh and everything following the interpreter is passed to it
as a single string).

fixes; #93609
related to: #65351 #11133 (and probably a bunch of others)

NOTE: scripts produced on platforms other than Darwin will remain unmodified
by this PR. However it might worth considering extending this fix to BSD systems
in general. I didn't do it since I have no way of testing it on systems other
than MacOS and linux.

* writers.makeScriptWriter: fix typo in comment

* writers.makeScriptWriter: fail build if interpreter of interpreter is a script
 2020-07-25 11:47:20 +02:00
Lassulus
a2ba53f4e1
Merge pull request #93758 from adrian-gierakowski/improve-writers.writePython 
writers.writePython2 and writePython3: use "bare" python if no deps are needed
 2020-07-25 11:43:56 +02:00
Jörg Thalheim
0216dbd769
Merge pull request #93165 from jbedo/singularity 
singularity: 3.2.1 -> 3.6.1
 2020-07-24 16:57:59 +01:00
Adrian Gierakowski
76437a88bb writers.writePython2 and writePython3: use "bare" python if no deps are needed 
`python.withPackages` has a runtime dependecy on bash since it's wrapped with
`makeWrapper`. This fix avoids bash as runtime dependency when it's not
needed.

as discussed here: https://github.com/NixOS/nixpkgs/issues/93609#issuecomment-662880047
 2020-07-24 11:39:01 +01:00
adisbladis
e890823467
emacs: Add native builds for nativeComp enabled emacsen 2020-07-24 03:16:17 +02:00
Jan Tojnar
0be3b18d3e
wrapGAppsHook: add comments 2020-07-24 00:36:12 +02:00
Jan Tojnar
49b89afcc2
wrapGAppsHook: add tests 2020-07-24 00:36:04 +02:00
Jan Tojnar
69b89979ba
wrapGAppsHook: move to a separate file 2020-07-23 22:08:18 +02:00
Jörg Thalheim
96092dc936
stdenv: make -nostdinc work as intended 
Right now we add glibc to search path also -nostdinc was provided,
which breaks projects providing their own gcc.
 2020-07-23 08:39:46 +01:00
Frederik Rietdijk
df0eab2726 Merge staging-next into staging 2020-07-22 16:50:25 +02:00
Daniël de Kok
68bd1c8552 blas: do not report an empty line for every checked symbol 2020-07-22 10:24:50 +02:00