github-actions[bot]
6bc7a2c814
Merge staging-next into staging
2020-12-06 12:18:43 +00:00
Frederik Rietdijk
b6e98f1895
Merge pull request #105584 from NixOS/staging-next
...
Staging next
2020-12-06 11:48:51 +01:00
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
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