alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
7334 commits 2 branches 2 tags 74 MiB
Commit graph

7334 commits

This branch
This branch
All branches
Author SHA1 Message Date
Will Dietz 8e7d77d494 globals.hh: don't use '==' to compare string literals 
Saw this in logs, also reported here:

8e6108ff71 (r28707288)
 2018-04-23 20:57:05 -05:00
Shea Levy 8e6108ff71
Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix 
Support extra compatible architectures (#1916)
 2018-04-23 08:48:22 -04:00
Shea Levy e2b028353b
Merge branch 'pos-crash-fix' of git://github.com/dezgeg/nix 2018-04-23 08:43:54 -04:00
Shea Levy 0aae411eaa
Merge branch 'add-test-eval-okay-nested-with' of git://github.com/ryantrinkle/nix 2018-04-23 08:43:14 -04:00
Shea Levy 25f580ee75
Merge branch 'doc/quiet' of git://github.com/samueldr/nix 2018-04-23 08:41:40 -04:00
Shea Levy 58f9ae0dcd
Merge branch 'hash-mismatch' of git://github.com/LnL7/nix 2018-04-23 08:40:34 -04:00
Peter Simons 655058b8a1
Merge pull request #2101 from andrew-d/adunham/fix-library-ordering 
Fix library ordering in Makefiles
 2018-04-22 07:57:54 +02:00
Andrew Dunham 3a918014b2 Fix library ordering in Makefiles 
The existing ordering linked `libutil` before `libstore`, which causes
link failures when building statically. This is due to `libstore` using
functions from `libutil`, and the fact that symbol resolution works
"forward" - i.e. if you pass `-lfoo -lbar -lbaz`, any symbols that
`libbar` uses from `libbaz` will be resolved, but symbols from `libfoo`
will not since it comes first in the command line.

All this to say: this commit reorders the libraries which fixes the link
errors.
 2018-04-21 21:10:52 -07:00
Peter Simons 040acdcee2
Merge pull request #1707 from dtzWill/fix/issue-1692 
ignore "interrupted" exception in progress callback
 2018-04-21 16:51:19 +02:00
Samuel Dionne-Riel 4b3a7f93a5 doc: Adds --quiet to the common options. 
Fixes #1298
 2018-04-20 16:34:06 -04:00
Daiderd Jordan 13d4d1c0a2
download: make hash mismatch error consistent with fetchurl 2018-04-20 21:07:32 +02:00
Eelco Dolstra 9296186c75
Merge pull request #2097 from dtzWill/fix/devpts-bind-mount 
build.cc: fix bind-mount of /dev/{pts,ptmx} fallback
 2018-04-20 19:42:39 +02:00
Will Dietz 6d9129014d build.cc: fix bind-mount of /dev/{pts,ptmx} fallback 
Don't bind-mount these to themselves,
mount them into the chroot directory.

Fixes pty issues when using sandbox on CentOS 7.4.
(build of perlPackages.IOTty fails before this change)
 2018-04-20 12:24:23 -05:00
Eelco Dolstra a8c61cef26
Merge pull request #2092 from grahamc/opt-in-or-out-daemon 
installer: allow opting in / out to the daemon installer
 2018-04-20 00:18:13 +02:00
Graham Christensen 51cbe99104
installer: default to the daemon installor for Linux with systemd 
Note: don't backport to 2.0-maintenance
 2018-04-19 13:45:17 -04:00
Graham Christensen 17b158af85
installer: allow opting in / out to the daemon installer 
By passing --daemon or --no-daemon, the installer can be forced to
select one or the other installation options, despite what the
automatic detection can provide.

This commit can be backported to 2.0-maintenance because it explicitly
turns off the daemon installation for Linux under systemd.
 2018-04-19 13:45:11 -04:00
Eelco Dolstra a99027d587
Fix tests.evalNixOS 
This failed because NixOS' release.nix calls builtins.fetchGit.
 2018-04-19 15:29:31 +02:00
Eelco Dolstra 6f907b7571
Merge pull request #2090 from poelzi/multi_search 
Allow multiple search experssions in nix search
 2018-04-19 10:38:24 +02:00
Daniel Poelzleithner f6e8ceafa6 add tests for multi search 2018-04-18 21:45:46 +02:00
Daniel Poelzleithner b712d4674b Allow multiple search experssions in nix search 
The common use case is to search for packages containing multiple words
like a "git" "frontend". Having only one expressions makes this simple regular
use case very complicated. Instead, search accepts multiple regular epressions
which all need to match.

nix search git 'gui|frontend'

returns a list of all git uis for example
 2018-04-18 21:08:35 +02:00
Félix Baylac-Jacqué 00584bb091
parser: Allow mixed nested and top-level attrpaths 
Fixes #2077.
 2018-04-18 18:44:38 +02:00
Shea Levy b37f5ae31d
isFunction: True on primops. 
Fixes #2073
 2018-04-17 14:33:12 -04:00
Eelco Dolstra a4aac7f88c
Handle arguments in $EDITOR 
Fixes #2079.
 2018-04-17 12:16:04 +02:00
Eelco Dolstra c74f838620
exportReferences: Check whether the path is in the input closure 
Fixes #2082.
 2018-04-17 12:03:27 +02:00
Eelco Dolstra 20cd1e39d5
Merge pull request #2068 from LnL7/version-2.1 
bump version to 2.1
 2018-04-17 11:22:02 +02:00
Félix Baylac-Jacqué 10d33452e2
nix-lang parser: Add mixed nested attrs tests. 
Part of issue #2077
 2018-04-17 09:13:01 +02:00
Eelco Dolstra d5c9315d84
Merge branch 'repl' of https://github.com/NinjaTrappeur/nix 2018-04-16 16:34:19 +02:00
Félix Baylac-Jacqué a91fb422fe
nix repl: Fix multiline SIGINT handling. 
Fixes #2076
 2018-04-16 16:09:30 +02:00
Eelco Dolstra d34fa2bcc3
Fix #1921 2018-04-13 15:42:35 +02:00
Eelco Dolstra 4fd28bee89
Fix broken DocBook 2018-04-13 15:12:58 +02:00
Shea Levy 3d748d3323
Merge pull request #2071 from sseefried-forked/clarify-glossary-and-garbage-collection 
Add to glossary and clarify garbage collection
 2018-04-12 06:12:38 -04:00
Sean Seefried 2ef8f0608c Add to glossary and clarify garbage collection 
While trying to understand garbage collection it was not immediately
clear that only the runtime dependency closure of output paths
would be kept (instead of the build-time dependency closure).
This commit attempts to clarify this by expanding some of the
glossary definitions and extending the Garbage Collection
section.
 2018-04-12 19:23:24 +10:00
Shea Levy dc0a542c9f
initPlugins: Fix dlopen error message. 2018-04-11 21:02:50 -04:00
Eelco Dolstra e3cdcf89b0
Remove non-existant fedora27i386 2018-04-11 11:48:42 +02:00
Eelco Dolstra 1839a5542a
Fix #2057 2018-04-11 11:42:17 +02:00
Daiderd Jordan f524bcb43d
bump version to 2.1 2018-04-10 22:58:25 +02:00
Eelco Dolstra d6aaa35478
Fix perl-bindings 
https://hydra.nixos.org/build/72636781
 2018-04-10 13:11:43 +02:00
John Arnold a405d25fa3 manual: Add all dependencies to source prerequisites (#2060) 2018-04-09 17:31:39 -04:00
Shea Levy a38fe5c1a8
Export required C++ version in pkgconfig. 2018-04-09 11:32:43 -04:00
Shea Levy 7459388448
Merge branch 'fix/ruby-shebang' of git://github.com/samueldr/nix 2018-04-09 10:54:39 -04:00
Shea Levy fd98fca7bb
Make prim_exec and prim_importNative available to plugins 2018-04-09 10:26:50 -04:00
Samuel Dionne-Riel a4c9b2595e Hardcodes nix-shell instead of /usr/bin/env nix-shell... 
... in the ruby shebang test.
 2018-04-09 09:36:54 -04:00
Shea Levy 377cf43ff6
Merge branch 'add-split-test-file' of git://github.com/mightybyte/nix 2018-04-09 09:12:14 -04:00
Eelco Dolstra 3ec1b3da45
Merge pull request #2061 from shlevy/nix-daemon-interrupt 
nix-daemon: Exit successfully when interrupted.
 2018-04-09 14:21:20 +02:00
Shea Levy 346c0ac361
nix-daemon: Exit successfully when interrupted. 
Fixes #2058.
 2018-04-09 08:05:54 -04:00
Eelco Dolstra d8b752ff49
Merge pull request #2055 from dudebout/patch-1 
fix typo in nix-env man page
 2018-04-09 10:21:51 +02:00
Eelco Dolstra 9387163d53
Merge pull request #2059 from andrew-d/adunham/fix-destdir 
Fix missing $DESTDIR when installing programs and BUILD_SHARED_LIBS=0
 2018-04-09 09:58:42 +02:00
Andrew Dunham f8ab9cef6c Fix missing $DESTDIR when installing programs 2018-04-08 18:22:10 -07:00
Samuel Dionne-Riel 9478f88681 Adds nix-shell test for special-cased ruby interpreter. 
The test fakes the interpreter only to verify the arguments it would be
given.
 2018-04-08 00:45:28 -04:00
Samuel Dionne-Riel 399f43c3d5 nix-shell: Fixes use with ruby shebangs. 
The ported code in 80ebc553ec was incorrectly ported.

```
-            $envCommand = "exec $execArgs $interpreter -e 'load(\"$script\")' -- ${\(join ' ', (map shellEscape, @savedArgs))}";
...
+                    envCommand = (format("exec %1% %2% -e 'load(\"%3%\") -- %4%") % execArgs % interpreter % script % joined.str()).str();
```

The single-quote finishing the small ruby snippet was lost in
translation.
 2018-04-07 22:38:45 -04:00