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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d1f8e6037107
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d5c1c813693
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 10, 2019

  1. bundlerApp: Set up passthru properly 

    The manual documents both bundlerEnv and bundlerApp as providing `env`
and `wrappedRuby` attributes on the resulting derivations. However only
bundlerEnv actually had these attributes. Update bundlerApp to provide
the same passthru that bundlerEnv does.
    @lilyball
    lilyball committed Jun 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    39eb49c View commit details

Commits on Jun 16, 2019

  1. Merge pull request #62971 from lilyball/bundlerApp-passthru 

    bundlerApp: Set up passthru properly
    @matthewbauer
    matthewbauer authored Jun 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d5c1c8 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/ruby-modules/bundler-app/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/ruby-modules/bundler-app/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,10 +36,15 @@
let
basicEnv = (callPackage ../bundled-common {}) args;

cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // {
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults

buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;

passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
} // passthru;
};
in
runCommand basicEnv.name cmdArgs ''