about summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-07-29
|\
| * Merge pull request #27733 from volth/patch-6Frederik Rietdijk2017-07-29
| |\
| | * Update default.nixvolth2017-07-29
| * | cli53: fix buildFrederik Rietdijk2017-07-29
| * | python.pkgs.sounddevice: 0.3.6 -> 0.3.8Frederik Rietdijk2017-07-29
| * | freecad: 0.16 -> 0.16.6712Frederik Rietdijk2017-07-29
| * | python.pkgs.cython: move expressionFrederik Rietdijk2017-07-29
| * | python.pkgs.blaze: move expressionFrederik Rietdijk2017-07-29
| * | python.pkgs.cycler: move expressionFrederik Rietdijk2017-07-29
| * | Update Geany 1.30.1 -> 1.31 (#27735)Frank Lanitz2017-07-29
| * | haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functionsPeter Simons2017-07-29
| |/
| * rkt: 1.27.0 -> 1.28.0Tim Steinbach2017-07-29
| * Merge pull request #25980 from nyarly/bundlerenv_usecasesCharles Strahan2017-07-28
| |\
| | * Grammar, spelling fixed.Judson2017-07-05
| | * Adding docs for bundlerApp.Judson2017-07-02
| | * Small changes in response to review.Judson2017-07-02
| | * Using pname and fetching versionsJudson2017-06-27
| | * A few cleanups and renames. One feature remains...Judson2017-06-27
| | * Fixing an overload of "pname"Judson2017-06-25
| | * Not quite done - something fishy about the name attrJudson2017-06-10
| | * Adding Corundum to all-packagesJudson2017-06-10
| | * Adding Corundum as demo of rubyToolJudson2017-06-10
| | * Docs and extras on tool/Judson2017-06-10
| | * Made gemdir handling into a common functionJudson2017-06-09
| | * Merge branch 'bundlerenv_usecases' of github.com:nyarly/nixpkgs into bundlere...Judson2017-05-31
| | |\
| | | * fix missing variable in bundler-envzimbatm2017-05-29
| | * | Starting to add tool builder. Extracting bundler file computation.Judson2017-05-31
| | |/
| | * Cleaning out obsolete filesJudson2017-05-27
| | * Restructuring filesJudson2017-05-27
| | * Merge branch 'master' into bundlerenv_usecasesJudson2017-05-21
| | |\
| | | * Merge remote-tracking branch 'nixos/master'Judson2017-04-24
| | | |\
| | * | | Final testingJudson2017-05-15
| | * | | Fixed platform test.Judson2017-05-12
| | * | | Fixed platform filtering.Judson2017-05-12
| | * | | Current round of tests pass, but filter function is failing to include when p...Judson2017-05-10
| | * | | Current round of tests pass, but filter function is failing to include when g...Judson2017-05-09
| | * | | Basically working. Checking against actual use cases.Judson2017-05-03
| | * | | Test harnessesJudson2017-05-01
| | * | | Merge remote-tracking branch 'nixos/master' into bundlerenv_usecasesJudson2017-04-30
| | |\ \ \
| | * | | | Starting decomposition of bundlerEnvJudson2017-04-24
| | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'nixos/master'Judson2017-04-09
| | |\ \ \
| | * | | | Adding "allBins" flag on bundlerEnvJudson2017-03-26
| | * | | | Simplifying interface on gemset.nix slightly.Judson2017-02-20
| | * | | | Need to handle "null" mainGemsJudson2017-02-19
| | * | | | Merge remote-tracking branch 'nixos/master'Judson2017-02-19
| | |\ \ \ \
| | * | | | | Updates to bundlerEnvJudson2017-02-19
| * | | | | | Merge pull request #27729 from yegortimoshenko/patch-6Graham Christensen2017-07-28
| |\ \ \ \ \ \
| | * | | | | | PULL_REQUEST_TEMPLATE.md: mereley -> merelyYegor Timoshenko2017-07-28
| |/ / / / / /
| * | | | | | nomad: 0.5.6 -> 0.6.0hectorj2017-07-29
| * | | | | | linux-copperhead: 4.12.3.a -> 4.12.4.aTim Steinbach2017-07-28