Skip to content
Snippets Groups Projects
  1. Oct 26, 2020
    • Eelco Dolstra's avatar
      Revert "Bump version to 3.0" · ac0e24f2
      Eelco Dolstra authored
      This reverts commit 189e6f5e.
      
      After some discussion, it seems better not to bump the major version
      number since most of the new features since 2.3 are marked
      experimental.
      ac0e24f2
  2. Oct 25, 2020
  3. Oct 22, 2020
    • Eelco Dolstra's avatar
      Merge pull request #4161 from edolstra/nix-develop-redirects · a78582c7
      Eelco Dolstra authored
      nix develop: Add --redirect flag to redirect dependencies
      a78582c7
    • Eelco Dolstra's avatar
      Fix clang build · 750ce500
      Eelco Dolstra authored
      750ce500
    • Eelco Dolstra's avatar
      nix develop: Add --redirect flag to redirect dependencies · f9438fb6
      Eelco Dolstra authored
      This is primarily useful if you're hacking simultaneously on a package
      and one of its dependencies. E.g. if you're hacking on Hydra and Nix,
      you would start a dev shell for Nix, and then a dev shell for Hydra as
      follows:
      
        $ nix develop \
          --redirect .#hydraJobs.build.x86_64-linux.nix ~/Dev/nix/outputs/out \
          --redirect .#hydraJobs.build.x86_64-linux.nix.dev ~/Dev/nix/outputs/dev
      
      (This assumes hydraJobs.build.x86_64-linux has a passthru.nix
      attribute. You can also use a store path.)
      
      This causes all references in the environment to those store paths to
      be rewritten to ~/Dev/nix/outputs/{out,dev}. Note: unfortunately, you
      may need to set LD_LIBRARY_PATH=~/Dev/nix/outputs/out/lib because
      Nixpkgs' ld-wrapper only adds -rpath entries for -L flags that point
      to the Nix store.
      f9438fb6
  4. Oct 21, 2020
  5. Oct 20, 2020
  6. Oct 19, 2020
    • Travis A. Everett's avatar
      discourage casual Big Sur installs · f289bdb9
      Travis A. Everett authored
      f289bdb9
    • Travis A. Everett's avatar
      create missing profile files to fix zsh envvars · c40bad41
      Travis A. Everett authored
      Env vars for ZSH were moved from /etc/zshrc to /etc/zshenv in #3608
      to address an issue with zshrc getting clobbered by OS updates, but
      /etc/zshenv doesn't exist by default--so *nothing* would get set up
      for zsh users unless they already happened to have /etc/zshenv.
      
      Creating these files if they don't exist. Also cut separate creation
      of profile.d/nix.sh, which isn't needed now.
      c40bad41
    • Travis A. Everett's avatar
      fix skipped multi-user install steps on macOS · b719f686
      Travis A. Everett authored
      Some of the changes in #3788 to support non-systemd Nix installs
      don't appear to be aware that the darwin installer exists, which
      resulted in some skipped steps and inappropriate instructions.
      b719f686
    • Travis A. Everett's avatar
      restore create-darwin-volume to release tarball · 3a8699ac
      Travis A. Everett authored
      The move from release.nix to flake.nix appears to have lost some
      changes from #3628 / 1c56f18a, leaving
      create-darwin-volume.sh out of the release tarball.
      
      Under the assumption that this was just an accident/byproduct of when
      flake.nix split off and not intentional, I am restoring those edits.
      3a8699ac
    • Travis A. Everett's avatar
      adapt to apfs.util flag diff in catalina/big sur · fe807904
      Travis A. Everett authored
      Fixes #3957. Just runs both forms to minimize moving parts.
      fe807904
    • Travis A. Everett's avatar
      replace xpath with xmllint --xpath; simplify · e736f8f6
      Travis A. Everett authored
      As mentioned in previous commit, Big Sur changes the syntax for the
      xpath command slightly.
      
      In the process of testing out replacements for these, I noticed a few
      small simplification wins.
      e736f8f6
    • Travis A. Everett's avatar
      fix xpath and conditional bugs; xpath -> xmllint · 1f02b65c
      Travis A. Everett authored
      - xpath -> xmllint: xpath's cli interface changed in Big Sur
        rather than add conditional logic for picking the correct
        syntax for xpath, I'm changing to xmllint --xpath, which
        appears to be consistent across versions I've tested...
      
      - /plist/dict/key[text()='Writable']/following-sibling::true[1]
        doesn't do quite what's expected. It was written to try to
        select a <true /> node paired with the Writable key, but it
        will also select the *next* <true /> node that appears even
        if it was paired with another key.
      
      - I think there's also a logic bug in the conditionals here.
        I'm not sure anyone ever actuall saw it, thanks to the xpath
        bug, though. With the xpath fix, this conditional passes if /nix
        does not exist, / IS writable, and the version is Catalina+.
      
        I think it meant to test for /nix does not exist, / is NOT
        writable, and the version is Catalina+. I reworked this lightly
        to make it a little clearer at the code level.
      1f02b65c
    • Travis A. Everett's avatar
      update macOS version handling for Big Sur · 9c3dc9d7
      Travis A. Everett authored
      Keeping this commit narrow for reviewability, but some of these
      conditionals will change in subsequent commits in this PR.
      
      Fixes #3852.
      9c3dc9d7
    • Eelco Dolstra's avatar
      Merge pull request #4080 from kquick/kwq/flake-int-doc · 9635fb77
      Eelco Dolstra authored
      Add some internal documentation for flake support objects.
      9635fb77
    • Eelco Dolstra's avatar
      Merge pull request #4162 from edolstra/nixpkgs-20.09 · 05347387
      Eelco Dolstra authored
      Switch to Nixpkgs 20.09
      05347387
  7. Oct 18, 2020
  8. Oct 17, 2020
Loading