Skip to content
Snippets Groups Projects
  1. Feb 07, 2017
  2. Feb 02, 2017
  3. Feb 01, 2017
  4. Jan 27, 2017
  5. Jan 26, 2017
    • Eelco Dolstra's avatar
      exportReferencesGraph: Export more complete info in JSON format · c2b0d874
      Eelco Dolstra authored
      This writes info about every path in the closure in the same format as
      ‘nix path-info --json’. Thus it also includes NAR hashes and sizes.
      
      Example:
      
        [
          {
            "path": "/nix/store/10h6li26i7g6z3mdpvra09yyf10mmzdr-hello-2.10",
            "narHash": "sha256:0ckdc4z20kkmpqdilx0wl6cricxv90lh85xpv2qljppcmz6vzcxl",
            "narSize": 197648,
            "references": [
              "/nix/store/10h6li26i7g6z3mdpvra09yyf10mmzdr-hello-2.10",
              "/nix/store/27binbdy296qvjycdgr1535v8872vz3z-glibc-2.24"
            ],
            "closureSize": 20939776
          },
          {
            "path": "/nix/store/27binbdy296qvjycdgr1535v8872vz3z-glibc-2.24",
            "narHash": "sha256:1nfn3m3p98y1c0kd0brp80dn9n5mycwgrk183j17rajya0h7gax3",
            "narSize": 20742128,
            "references": [
              "/nix/store/27binbdy296qvjycdgr1535v8872vz3z-glibc-2.24"
            ],
            "closureSize": 20742128
          }
        ]
      
      Fixes #1134.
      c2b0d874
    • Eelco Dolstra's avatar
      Add support for passing structured data to builders · 6de33a9c
      Eelco Dolstra authored
      Previously, all derivation attributes had to be coerced into strings
      so that they could be passed via the environment. This is lossy
      (e.g. lists get flattened, necessitating configureFlags
      vs. configureFlagsArray, of which the latter cannot be specified as an
      attribute), doesn't support attribute sets at all, and has size
      limitations (necessitating hacks like passAsFile).
      
      This patch adds a new mode for passing attributes to builders, namely
      encoded as a JSON file ".attrs.json" in the current directory of the
      builder. This mode is activated via the special attribute
      
        __structuredAttrs = true;
      
      (The idea is that one day we can set this in stdenv.mkDerivation.)
      
      For example,
      
        stdenv.mkDerivation {
          __structuredAttrs = true;
          name = "foo";
          buildInputs = [ pkgs.hello pkgs.cowsay ];
          doCheck = true;
          hardening.format = false;
        }
      
      results in a ".attrs.json" file containing (sans the indentation):
      
        {
          "buildInputs": [],
          "builder": "/nix/store/ygl61ycpr2vjqrx775l1r2mw1g2rb754-bash-4.3-p48/bin/bash",
          "configureFlags": [
            "--with-foo",
            "--with-bar=1 2"
          ],
          "doCheck": true,
          "hardening": {
            "format": false
          },
          "name": "foo",
          "nativeBuildInputs": [
            "/nix/store/10h6li26i7g6z3mdpvra09yyf10mmzdr-hello-2.10",
            "/nix/store/4jnvjin0r6wp6cv1hdm5jbkx3vinlcvk-cowsay-3.03"
          ],
          "propagatedBuildInputs": [],
          "propagatedNativeBuildInputs": [],
          "stdenv": "/nix/store/f3hw3p8armnzy6xhd4h8s7anfjrs15n2-stdenv",
          "system": "x86_64-linux"
        }
      
      "passAsFile" is ignored in this mode because it's not needed - large
      strings are included directly in the JSON representation.
      
      It is up to the builder to do something with the JSON
      representation. For example, in bash-based builders, lists/attrsets of
      string values could be mapped to bash (associative) arrays.
      6de33a9c
    • Eelco Dolstra's avatar
    • Eelco Dolstra's avatar
      Fix assertion failure when a path is locked · b1f00153
      Eelco Dolstra authored
      Fixes:
      
        nix-store: src/libstore/build.cc:3649: void nix::Worker::run(const Goals&): Assertion `!awake.empty()' failed.
      b1f00153
    • Eelco Dolstra's avatar
      Fix interrupt handling · 83ae6503
      Eelco Dolstra authored
      83ae6503
    • Eelco Dolstra's avatar
    • Eelco Dolstra's avatar
      openLockFile: Return an AutoCloseFD · a55f5897
      Eelco Dolstra authored
      a55f5897
    • Eelco Dolstra's avatar
      UserLock: Make more RAII-ish · c0f2f4ee
      Eelco Dolstra authored
      c0f2f4ee
    • Eelco Dolstra's avatar
    • Eelco Dolstra's avatar
      On HTTP errors, also show the curl error · e8c43abd
      Eelco Dolstra authored
      This is a hopefully temporary measure to diagnose the intermittent
      "HTTP error 200" failures.
      e8c43abd
    • Eelco Dolstra's avatar
      Move exportReferencesGraph into a separate method · 4425a5c5
      Eelco Dolstra authored
      startBuilder() is getting rather obese.
      4425a5c5
  6. Jan 25, 2017
  7. Jan 24, 2017
Loading