Bump version to 1.11.3

launchd: Set $SSL_CERT_FILE
Otherwise in particular https://cache.nixos.org won't work in the daemon. (cherry picked from commit eff80419c7)
2016-08-22 10:20:41 -04:00 · 2016-08-19 13:11:03 +02:00 · 2016-08-15 07:42:51 -04:00 · 2016-07-23 13:22:52 -04:00 · 2016-05-26 15:55:51 +01:00 · 2016-02-10 12:10:03 +01:00
13 changed files with 54 additions and 23 deletions
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -12,5 +12,10 @@
    <string>/var/log/nix-daemon.log</string>
    <key>StandardOutPath</key>
    <string>/dev/null</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+      <key>SSL_CERT_FILE</key>
+      <string>/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt</string>
+    </dict>
  </dict>
 </plist>
--- a/release.nix
+++ b/release.nix
@@ -207,6 +207,10 @@ let
    deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1410x86_64) [];
    deb_ubuntu1504i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1504i386) [ "libsodium-dev" ];
    deb_ubuntu1504x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1504x86_64) [ "libsodium-dev" ];
+    deb_ubuntu1510i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1510i386) [ "libsodium-dev" ] [ "libsodium13"];
+    deb_ubuntu1510x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1510x86_64) [ "libsodium-dev" ] [ "libsodium13" ];
+    deb_ubuntu1604i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1604i386) [ "libsodium-dev" ] [ "libsodium18" ];
+    deb_ubuntu1604x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1604x86_64) [ "libsodium-dev" ] [ "libsodium18" ];


    # System tests.
@@ -318,7 +322,7 @@ let
  makeDeb_x86_64 = makeDeb "x86_64-linux";

  makeDeb =
-    system: diskImageFun: extraPackages:
+    system: diskImageFun: extraPackages: extraDebPackages:

    with import <nixpkgs> { inherit system; };

@@ -331,10 +335,11 @@ let
            ++ extraPackages; };
      memSize = 1024;
      meta.schedulingPriority = 50;
+      postInstall = "make installcheck";
      configureFlags = "--sysconfdir=/etc";
      debRequires =
        [ "curl" "libdbd-sqlite3-perl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libwww-curl-perl" "libssl1.0.0" "liblzma5" ]
-        ++ lib.optionals (lib.elem "libsodium-dev" extraPackages) [ "libsodium13" ] ;
+        ++ extraDebPackages;
      debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
      doInstallCheck = true;
    };
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -92,7 +92,7 @@ p=$NIX_LINK/etc/profile.d/nix.sh
 added=
 for i in .bash_profile .bash_login .profile; do
    fn="$HOME/$i"
-    if [ -e "$fn" ]; then
+    if [ -w "$fn" ]; then
        if ! grep -q "$p" "$fn"; then
            echo "modifying $fn..." >&2
            echo "if [ -e $p ]; then . $p; fi # added by Nix installer" >> $fn
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -57,7 +57,7 @@ if ($runEnv && defined $ARGV[0] && $ARGV[0] !~ /nix-shell/) {
            while (<SCRIPT>) {
                chomp;
                if (/^\#\!\s*nix-shell (.*)$/) {
-                    push @ARGV, shellwords(/ /, $1);
+                    push @ARGV, shellwords($1);
                }
            }
        }
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -8,6 +8,7 @@

 %x STRING
 %x IND_STRING
+%x INSIDE_DOLLAR_CURLY


 %{
@@ -93,6 +94,8 @@ URI         [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~

 %%

+<INITIAL,INSIDE_DOLLAR_CURLY>{
+

 if          { return IF; }
 then        { return THEN; }
@@ -124,11 +127,15 @@ or          { return OR_KW; }
              return INT;
            }

-\$\{        { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
-\{          { PUSH_STATE(INITIAL); return '{'; }
-\}          { POP_STATE(); return '}'; }
+\$\{        { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
+}

-\"          { PUSH_STATE(STRING); return '"'; }
+\}                           { return '}'; }
+<INSIDE_DOLLAR_CURLY>\}      { POP_STATE(); return '}'; }
+\{                           { return '{'; }
+<INSIDE_DOLLAR_CURLY>\{      { PUSH_STATE(INSIDE_DOLLAR_CURLY); return '{'; }
+
+<INITIAL,INSIDE_DOLLAR_CURLY>\"          { PUSH_STATE(STRING); return '"'; }
 <STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)*\$/\" |
 <STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)+ {
              /* It is impossible to match strings ending with '$' with one
@@ -137,11 +144,11 @@ or          { return OR_KW; }
              yylval->e = unescapeStr(data->symbols, yytext);
              return STR;
            }
-<STRING>\$\{  { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
+<STRING>\$\{  { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
 <STRING>\"  { POP_STATE(); return '"'; }
 <STRING>.   return yytext[0]; /* just in case: shouldn't be reached */

-\'\'(\ *\n)?     { PUSH_STATE(IND_STRING); return IND_STRING_OPEN; }
+<INITIAL,INSIDE_DOLLAR_CURLY>\'\'(\ *\n)?     { PUSH_STATE(IND_STRING); return IND_STRING_OPEN; }
 <IND_STRING>([^\$\']|\$[^\{\']|\'[^\'\$])+ {
                   yylval->e = new ExprIndStr(yytext);
                   return IND_STR;
@@ -158,7 +165,7 @@ or          { return OR_KW; }
                   yylval->e = unescapeStr(data->symbols, yytext + 2);
                   return IND_STR;
                 }
-<IND_STRING>\$\{ { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
+<IND_STRING>\$\{ { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
 <IND_STRING>\'\' { POP_STATE(); return IND_STRING_CLOSE; }
 <IND_STRING>\'   {
                   yylval->e = new ExprIndStr("'");
@@ -166,6 +173,8 @@ or          { return OR_KW; }
                 }
 <IND_STRING>.    return yytext[0]; /* just in case: shouldn't be reached */

+<INITIAL,INSIDE_DOLLAR_CURLY>{
+
 {PATH}      { yylval->path = strdup(yytext); return PATH; }
 {HPATH}     { yylval->path = strdup(yytext); return HPATH; }
 {SPATH}     { yylval->path = strdup(yytext); return SPATH; }
@@ -177,6 +186,7 @@ or          { return OR_KW; }

 .           return yytext[0];

+}

 %%

--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1657,6 +1657,7 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
    if (state.restricted) throw Error(format("‘%1%’ is not allowed in restricted mode") % who);

    string url;
+    string name;

    state.forceValue(*args[0]);

@@ -1665,9 +1666,11 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
        state.forceAttrs(*args[0], pos);

        for (auto & attr : *args[0]->attrs) {
-            string name(attr.name);
-            if (name == "url")
+            string n(attr.name);
+            if (n == "url")
                url = state.forceStringNoCtx(*attr.value, *attr.pos);
+            else if (n == "name")
+                name = state.forceStringNoCtx(*attr.value, *attr.pos);
            else
                throw EvalError(format("unsupported argument ‘%1%’ to ‘%2%’, at %3%") % attr.name % who % attr.pos);
        }
@@ -1678,7 +1681,7 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
    } else
        url = state.forceStringNoCtx(*args[0], pos);

-    Path res = downloadFileCached(url, unpack);
+    Path res = downloadFileCached(url, unpack, name);
    mkString(v, res, PathSet({res}));
 }

--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1063,8 +1063,10 @@ void DerivationGoal::outputsSubstituted()
 {
    trace("all outputs substituted (maybe)");

-    if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback)
-        throw Error(format("some substitutes for the outputs of derivation ‘%1%’ failed (usually happens due to networking issues); try ‘--fallback’ to build derivation from source ") % drvPath);
+    if (nrFailed > 0 && nrFailed > nrNoSubstituters + nrIncompleteClosure && !settings.tryFallback) {
+        done(BuildResult::TransientFailure, (format("some substitutes for the outputs of derivation ‘%1%’ failed (usually happens due to networking issues); try ‘--fallback’ to build derivation from source ") % drvPath).str());
+        return;
+    }

    /*  If the substitutes form an incomplete closure, then we should
        build the dependencies of this derivation, but after that, we
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -188,7 +188,7 @@ DownloadResult downloadFile(string url, const DownloadOptions & options)
 }


-Path downloadFileCached(const string & url, bool unpack)
+Path downloadFileCached(const string & url, bool unpack, string name)
 {
    Path cacheDir = getEnv("XDG_CACHE_HOME", getEnv("HOME", "") + "/.cache") + "/nix/tarballs";
    createDirs(cacheDir);
@@ -223,9 +223,10 @@ Path downloadFileCached(const string & url, bool unpack)
            storePath = "";
    }

-    string name;
-    auto p = url.rfind('/');
-    if (p != string::npos) name = string(url, p + 1);
+    if (name == "") {
+        auto p = url.rfind('/');
+        if (p != string::npos) name = string(url, p + 1);
+    }

    if (!skip) {

--- a/src/libstore/download.hh
+++ b/src/libstore/download.hh
@@ -20,7 +20,7 @@ struct DownloadResult

 DownloadResult downloadFile(string url, const DownloadOptions & options);

-Path downloadFileCached(const string & url, bool unpack);
+Path downloadFileCached(const string & url, bool unpack, string name = "");

 MakeError(DownloadError, Error)

--- a/tests/lexer.nix
+++ b/tests/lexer.nix
@@ -0,0 +1,2 @@
+let const = a: "const"; in
+''${ const { x = "q"; }}''
--- a/tests/lexer.sh
+++ b/tests/lexer.sh
@@ -0,0 +1,3 @@
+source common.sh
+
+nix-instantiate --eval ./lexer.nix
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -11,7 +11,7 @@ nix_tests = \
  binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \
  multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \
  binary-cache.sh nix-profile.sh repair.sh dump-db.sh case-hack.sh \
-  check-reqs.sh pass-as-file.sh tarball.sh
+  check-reqs.sh pass-as-file.sh tarball.sh lexer.sh
  # parallel.sh

 install-tests += $(foreach x, $(nix_tests), tests/$(x))
--- a/2
+++ b/2
@@ -1 +1 @@
-1.11.1
+1.11.3
Author	SHA1	Message	Date
Shea Levy	2ac966a464	Bump version to 1.11.3	2016-08-22 10:20:41 -04:00
Eelco Dolstra	6a493a7c44	launchd: Set $SSL_CERT_FILE Otherwise in particular https://cache.nixos.org won't work in the daemon. (cherry picked from commit `eff80419c7`)	2016-08-19 13:11:03 +02:00
Shea Levy	7bb4d028a8	builtins.fetch{url,tarball}: Allow name attribute (cherry picked from commit `d52d391164`)	2016-08-15 07:42:51 -04:00
Shea Levy	66151dc154	Respect --keep-going when a substituter fails. Fixes #977 (cherry picked from commit `18b0808475`)	2016-07-23 13:22:52 -04:00
Domen Kožar	0eb8bbb31e	add Ubuntu 16.03 .deb builds (cherry picked from commit `bf386de9f2`) Signed-off-by: Domen Kožar <domen@dev.si>	2016-05-26 15:55:51 +01:00
Eelco Dolstra	437d3cdc7a	Bump version to 1.11.2	2016-02-10 12:10:03 +01:00
Alex Cruice	0322c92560	Check shell profile is writeable before modifying The `set -e` at the top of the script causes the installation to fail to complete if the shell profile is not writeable. Checking file existence only is not enough. (cherry picked from commit `ad0dc41899`)	2016-02-10 12:04:47 +01:00
Brian McKenna	1852f7dbf3	Fix broken call to shellwords nix-shell shebangs were broken by `9018deab` (cherry picked from commit `3baf8be1d1`)	2016-02-10 12:04:18 +01:00
Eelco Dolstra	08500066ea	Revert "Revert "next try for "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751 """ This reverts commit `b669d3d2e8`. (cherry picked from commit `5d8b7eb3e1`)	2016-02-10 12:04:08 +01:00
@@ -1 +1 @@
 .11.1
 .11.3