JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
183,388 Commits 2 Branches 0 Tags 13 GiB
e0648781b1
Commit Graph

3344 Commits

Author SHA1 Message Date
Matthew Bauer
c08cdfa781
Merge pull request #54543 from thefloweringash/git-prefetch-errors 
nix-prefetch-git: propagate errors under --quiet
 2019-06-18 11:20:28 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Vladimír Čunát
788261a1a9
Merge branch 'master' into staging-next 
Brings in Haskell rebuild.
Hydra nixpkgs: ?compare=1525186
 2019-06-14 17:47:23 +02:00
Elis Hirwing
039983bd7a
Merge pull request #62783 from Izorkin/php-packages 
php: update build config and php package
 2019-06-12 13:14:22 +02:00
Frederik Rietdijk
7184efb40a Merge master into staging-next 2019-06-12 09:22:07 +02:00
Izorkin
925f803e28 phpPackages: build phpPackages with re2c 2019-06-11 22:21:35 +03:00
Matthew Bauer
4e5c9b8cf4
Merge pull request #54921 from grabango/master 
Use nativeBuildInputs for building Docker images
 2019-06-10 21:38:47 -04:00
Matthew Bauer
ebd038dc2d
Merge pull request #56161 from coreyoconnor/appimage-run-xcbutil 
appimage build-support: add xorg.xcbutil*
 2019-06-10 21:37:15 -04:00
Frederik Rietdijk
e58f0f6c99 Merge master into staging-next 2019-06-10 10:35:50 +02:00
Jaakko Luttinen
fa95878fd3 writeScript: fix docstring 
Fixes #59299

See:
b23dbb1a5d
 2019-06-09 12:45:31 +02:00
Frederik Rietdijk
d3afcac771 Merge master into staging-next 2019-06-09 12:28:52 +02:00
Mario Rodas
b2e56ccea0
mirrors: add osdn mirrors 2019-06-08 23:37:36 -05:00
Mario Rodas
c0eaf5e917
mirrors: rename sourceforgejp to osdn 
SourceForge.jp renamed to OSDN on May 11, 2015.
https://osdn.net/projects/sourceforge/news/24923
 2019-06-08 23:25:47 -05:00
lewo
0e28092a56
Merge pull request #62773 from danieldk/docker-shared-layer-test 
nixos/tests/docker-tools: check layer sharing with buildLayeredImage
 2019-06-08 09:01:11 +02:00
Vladimír Čunát
8f5edef47e
Merge branch 'staging-next' (PR #62209) 2019-06-07 08:07:10 +02:00
Daniël de Kok
3b0d5b5ed3 nixos/tests/docker-tools: check layer sharing with buildLayeredImage 
Adapted from grahamc's blog post on layered Docker images in Nix:

https://grahamc.com/blog/nix-and-layered-docker-images
 2019-06-06 15:03:08 +02:00
Daniël de Kok
d7f3186b48 dockerTools.buildLayeredImage: restore layer sharing 
PR #58431 added /nix/store to each layer.tar. However, the timestamp was
not explicitly set while adding /nix and /nix/store to the archive. This
resulted in different SHA256 hashes of layer.tar between image builds.

This change sets time and owner when tar'ing /nix/store.
 2019-06-06 07:40:20 +02:00
Matthew Bauer
87a69edf67
Merge pull request #60559 from JohnAZoidberg/patchshebangs-multiple-args 
patchShebangs: Allow multiple args
 2019-06-05 20:36:12 -04:00
Vladimír Čunát
576af17187
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1523575
 2019-06-05 11:06:44 +02:00
Danylo Hlynskyi
f29b88df44
Merge pull request #53991 from arianvp/fix-initrd 
build-support/make-initrd:  Don't derive derivation name from file name
 2019-06-05 01:22:49 +02:00
Vladimír Čunát
c4724fb7bc
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1523028
 2019-06-03 10:01:25 +02:00
Nikolay Amiantov
06f27dc2e9 chrootenv: propagate nested chrootenv /host 
To avoid symlink loops to /host in nested chrootenvs we need to remove
one level of indirection. This is also what's generally expected of
/host contents.
 2019-05-30 15:34:01 +03:00
Nikolay Amiantov
7664ffbbaf chrootenv: small improvements 
* Remove unused argument from pivot_root;
* Factor out tmpdir creation into a separate function;
* Remove unused fstype from bind mount;
* Use unlink instead of a treewalk to remove empty temporary directory.
 2019-05-30 15:34:01 +03:00
Nikolay Amiantov
e0d3bc292c chrootenv: make stackable 
The problem with stacking chrootenv before was that CLONE_NEWUSER cannot
be used when a child uses chroot. So instead of that we use pivot_root
which replaces root in the whole namespace. This requires our new root
to be an actual fs so we mount tmpfs.
 2019-05-30 15:33:30 +03:00
Arian van Putten
b086b342bb build-support/make-initrd: Don't derive derivation name from file name 
not all valid file names are valid derivation names. This can cause
troubles when, for example, trying to place systemd template unit
files, which contain an '@' in their name,  in an initrd.

Fixes #53987
 2019-05-29 16:07:05 +02:00
Frederik Rietdijk
b95dfb09b8 Merge staging into staging-next 2019-05-29 10:39:52 +02:00
Silvan Mosberger
b4e16b6c30
Merge pull request #62112 from Lassulus/writers-check 
build-support/writers: actually run checks
 2019-05-28 12:07:22 +02:00
Frederik Rietdijk
3685108787 Merge staging-next into staging 2019-05-28 08:32:57 +02:00
lassulus
9746fae577 build-support/writers: actually run checks 2019-05-28 07:51:46 +02:00
Silvan Mosberger
b6a959b59e
Merge pull request #62040 from abbradar/chrootenv-extend 
buildFHSUserEnv: extend PATH and LD_LIBRARY_PATH
 2019-05-27 17:56:04 +02:00
Las
50c215df4a
Fix chrootenv segfaulting on exit 
glibc 2.27 (and possibly other versions) can't handle an `nopenfd` value larger than 2^19 in `ntfw`, which is problematic if you've set the maximum number of fds per process to a value higher than that.
 2019-05-26 17:19:06 +02:00
Daniel Schaefer
7c3d7521f0 patchShebangs: Exit if no arguments were given 
Commit "patchShebangs: Allow for multiple arguments" 4a1e51f957
removed the check. We don't want to break existing usages so this
introduces it again with a successful exit code.
 2019-05-26 16:05:06 +02:00
Vladimír Čunát
b4ae841b23
Merge branch 'staging-next' into staging 2019-05-26 09:48:55 +02:00
Daniel Schaefer
4a1e51f957 patchShebangs: Allow for multiple arguments 
It's tempting to think patchShebangs supports multiple arguments.
Without this patch it just silently ignores all but the first. Now it
patches the shebangs in all of its arguments.

Fixes: #57695
 2019-05-25 16:15:54 +02:00
Daniel Schaefer
81d3bd60a4 patchShebangs: Explain that script must be executable 2019-05-25 16:15:54 +02:00
Nikolay Amiantov
668f8a12f7 buildFHSUserEnv: extend PATH and LD_LIBRARY_PATH 
This allows one to run applications from PATH and override libraries for
applications inside chrootenv. Useful for development environments.
 2019-05-25 11:37:01 +03:00
Dmitry Kalinkin
44f05df20b
Merge pull request #60877 from veprbl/pr/nuke-refs-quotemeta-fix 
nukeReferences: fix for store paths with special characters
 2019-05-23 17:07:18 -04:00
Dmitry Kalinkin
44b551c0c0
addOpenGLRunpath: only apply to ELF files 
Fixes libglvnd build
 2019-05-23 16:52:45 -04:00
Florian Klink
2ed6903da5
libglvnd, ocl-icd, vulkan-loader: Add /run/opengl-driver(-32) to RUNPATH. (#60985) 
libglvnd, ocl-icd, vulkan-loader: Add /run/opengl-driver(-32) to RUNPATH.
 2019-05-22 23:36:01 +02:00
Nikolay Amiantov
2874e849d9 addOpenGLRunpath: Add new hook for setting RUNPATH. 
This hook allows to add NixOS driver libraries path to given ELF
objects' RUNPATH. We use it instead of settings RUNPATH manually
everywhere. It must be invoked in postFixup so that RUNPATH stripping
does not remove the path.

It puts the path first instead of last so that system-wide drivers
are always preferred.
 2019-05-22 18:19:55 +02:00
Robin Gloster
6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull 
treewide: Remove usage of isNull
 2019-05-18 09:36:24 +00:00
Frederik Rietdijk
d4464ff8fe Merge master into staging-next 2019-05-16 08:17:55 +02:00
Alexandre Peyroux
9760c3e7ec vmTools: update debian-9.4 repositories to debian-9.8 Release.xz urls 2019-05-14 21:06:12 +02:00
Frederik Rietdijk
8abe5ee07e Merge master into staging-next 2019-05-14 10:23:13 +02:00
lewo
42ee7cdf9d
Merge pull request #61089 from nlewo/pr-fix-layer-order 
dockerTools: Fix Docker layers order
 2019-05-13 15:27:43 +02:00
Frederik Rietdijk
ef0dbef7f1 Merge master into staging-next 2019-05-12 19:59:09 +02:00
Alyssa Ross
5c36a8d556
Merge pull request #61052 from deliciouslytyped/patch-2 
trivial-builders: add writeShellScript and minor cleaning
 2019-05-12 17:43:35 +00:00
deliciouslytyped
103ab24e94 trivial-builders: add writeShellScript and minor cleaning 
Add writeShellScript
Small whitespace additions
Fix "Example:" docstring sections for some of the writeScript functions to use the correct function
 2019-05-12 19:40:01 +02:00
Vladimír Čunát
0fb181b8ce
Merge #59422: patchutils: 0.3.3 -> 0.3.4, keep 0.3.3 for fetchpatch 2019-05-12 15:17:10 +02:00
Vladimír Čunát
e07c5ec107
fetchpatch: explain why we use 0.3.3 2019-05-12 15:16:45 +02:00