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: 6484eac5b2e3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 450f6b7987b4
Choose a head ref
  • 4 commits
  • 10 files changed
  • 2 contributors

Commits on Jan 4, 2018

  1. bundler-env: Remove unused args

    @aneeshusa
    aneeshusa committed Jan 4, 2018
    Copy the full SHA
    aa9fc7e View commit details
    Browse the repository at this point in the history

  2. ruby-modules: Allow overriding gemset 

    This allows patching the gemset output by bundix from a default.nix
file, making it easier to perform updates since the bundix update no
longer has to be manually updated.
    @aneeshusa
    aneeshusa committed Jan 4, 2018
    Copy the full SHA
    8686b98 View commit details
    Browse the repository at this point in the history

  3. ruby treewide: don't merge source into top-level 

    Keep the `source` attrset distinct to prevent its entries from merging
with the top level attrs.
Since each type of source has a different set of entries for `source`,
this is the easiest way to keep them together.
This will pave the way for a new `url` type of source.

This is a mass-rebuild of many ruby packages,
notably those using `git` type sources.
    @aneeshusa
    aneeshusa committed Jan 4, 2018
    Copy the full SHA
    36f1bcb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33014 from aneeshusa/general-ruby-improvements-fo… 

    …r-vagrant-from-source

General ruby improvements for vagrant from source
    @zimbatm
    zimbatm committed Jan 4, 2018
    Copy the full SHA
    450f6b7 View commit details
    Browse the repository at this point in the history