Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 53d688a3bfc0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c5c8f17422ba
Choose a head ref
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Jan 4, 2018

  1. ruby-modules: Add new url source type

    This just defers to `fetchurl` for fetching.
    
    Additionally, update the `nix-bundle-install.rb` script to handle gems
    installed from a path, i.e. those with a `url` source.
    Some parts of that script have been disabled in the `path` case
    that likely shouldn't be, but cause errors and aren't necessary to get
    `vagrant` to work.
    aneeshusa committed Jan 4, 2018
    Copy the full SHA
    0750c5a View commit details
    Browse the repository at this point in the history
  2. vagrant: Build from source

    This is not quite as elegant as using `bundlerApp`,
    which I could not get working.
    However, this still uses most of the Ruby infrastructure,
    including stock bundix, and should be fairly reasonable to maintain.
    
    This means no more hacks to work around wrong embedded binaries,
    and no need for an old version of Ruby.
    
    Note that `vagrant share` is no longer included,
    as that functionality is closed-source
    and not present in the upstream source code.
    
    The Vagrant maintainers publish official Vagrant installers,
    which they prefer people use as most platforms don't
    have great support for pinning known-good dependencies.
    When run outside one of the offical installers,
    Vagrant normally prints a warning to that effect.
    However, Vagrant does run outside the installer environment
    (nominally to support Vagrant development),
    and this has the effect of functioning better by respecting
    OS certs and shared libraries,
    as opposed to trying to use bundled versions.
    To keep these postive side effects without having to see the warning
    on every Vagrant invocation, patch out the call to print the warning.
    
    Note that I have reset the maintainers since the implementation is
    totally redone; I'm happy to re-add any of the current maintainers.
    aneeshusa committed Jan 4, 2018
    Copy the full SHA
    8c3553b View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Merge pull request #30952 from aneeshusa/build-vagrant-from-source

    Build vagrant from source
    zimbatm committed Jan 10, 2018
    Copy the full SHA
    c5c8f17 View commit details
    Browse the repository at this point in the history