| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs | Robin Gloster | 2021-05-24 | 2 | -8/+4 |
| |\ | |||||
| | * | rubyPackages: update | Mario Rodas | 2021-05-21 | 1 | -7/+3 |
| | * | treewide: remove worldofpeace from meta.maintainers•••(It was requested by them.) I left one case due to fetching from their personal repo: pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix | Vladimír Čunát | 2021-05-07 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-04-29 | 1 | -2/+2 |
| |\| | |||||
| | * | Merge master into staging-next | github-actions[bot] | 2021-04-17 | 1 | -17/+26 |
| | |\ | |||||
| | * \ | Merge branch 'master' into staging-next | Martin Weinelt | 2021-04-16 | 1 | -4/+0 |
| | |\ \ | |||||
| | * \ \ | Merge master into staging-next | github-actions[bot] | 2021-04-15 | 1 | -0/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'staging' into staging-next•••A few conflicts but relatively clear ones (I think). | Vladimír Čunát | 2021-04-14 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging | Luke Granger-Brown | 2021-04-12 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'staging-next' into staging••• Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix | Dmitry Kalinkin | 2021-04-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'staging-next' into staging•••In python-packages.nix, resolve conflict between 50d604314e736d24dc7aa6749b5482c859147b17 and 187d0371ab3220ee40da1f616e4c48d85ac28986. | Jan Tojnar | 2021-04-08 | 1 | -1/+5 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'staging-next' into staging | Jan Tojnar | 2021-04-06 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | ruby: reproducible•••Generated Makefile's were nested deeper than the existing rm would be able to remove. | Thomas Bereknyei | 2021-04-05 | 1 | -2/+2 |
| * | | | | | | | | | | buildRubyGem: structured-attrs build fix | Robin Gloster | 2021-04-27 | 2 | -9/+11 |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-04-23 | 5 | -41/+62 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | | mikutter: 4.0.0 -> 4.1.4 (#119454) | midchildan | 2021-04-17 | 1 | -17/+26 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | | Revert "Merge pull request #117702 from edude03/patch-4"•••This reverts commit bc5c0c559f1c93ccea9a7f21066b6314831bea3d, reversing changes made to 44dac5f5c69c2c72f3b2018ec681e477e0fc6a6c. | ajs124 | 2021-04-15 | 1 | -4/+0 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | | Merge pull request #117702 from edude03/patch-4•••gems: Added mime info path for mimemagic | Ryan Mulligan | 2021-04-15 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | | * | | | | | | Update pkgs/development/ruby-modules/gem-config/default.nix•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> | Michael Francis | 2021-03-27 | 1 | -1/+1 |
| | | * | | | | | | remove whitespace | Michael Francis | 2021-03-26 | 1 | -1/+1 |
| | | * | | | | | | Added mime info path for mimemagic | Michael Francis | 2021-03-26 | 1 | -1/+5 |
| | * | | | | | | | kramdown-rfc2629: 1.3.37 -> 1.4.1 and move to rubyPackages (#117283) | Masanori Ogino | 2021-04-13 | 1 | -0/+1 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | Merge pull request #115582 from jdelStrother/bundler-override•••bundlerEnv: Allow overriding bundler | Sandro | 2021-04-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | | * | | | | | bundlerEnv: Allow overriding bundler•••Prior to this it doesn't seem to be possible to customize the version of bundler used in a bundlerEnv app. This change allows something like the following: ```nix let bundler = pkgs.buildRubyGem rec { gemName="bundler"; name="bundler-2.2.11"; version="2.2.11"; source.sha256="1izx6wsjdm6mnbxazgz1z5qbhwrrisbq0np2nmx4ij6lrqjy18jf"; }; in pkgs.bundlerEnv.override { inherit bundler; } { name="test"; gemdir=./.; } ``` to use bundler 2.2.11 rather than the 2.1.5 default. | Jonathan del Strother | 2021-03-10 | 1 | -1/+1 |
| | * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | | * | | | | | bundix: add marsam to maintainers | Mario Rodas | 2021-04-07 | 1 | -1/+1 |
| | * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-08 | 1 | -1/+5 |
| | |\| | | | | | | |_|_|_|/ | |/| | | | | |||||
| | | * | | | | gitlab: 13.9.4 -> 13.10.2 | talyz | 2021-04-07 | 1 | -1/+5 |
| | * | | | | | Merge branch 'master' into staging-next | Jan Tojnar | 2021-04-06 | 1 | -2/+2 |
| | |\| | | | | | |_|_|/ | |/| | | | |||||
| | | * | | | kerberos: deprecate alias | Sandro Jäckel | 2021-04-04 | 1 | -2/+2 |
| | * | | | | Merge master into staging-next | github-actions[bot] | 2021-04-03 | 1 | -3/+3 |
| | |\| | | | |||||
| | | * | | | Merge pull request #118296 from purcell/ruby-pg_query-2.0.2•••defaultGemConfig.pg_query: 2.0.1 -> 2.0.2 | Sandro | 2021-04-03 | 1 | -3/+3 |
| | | |\ \ \ | |||||
| | | | * | | | defaultGemConfig.pg_query: 2.0.1 -> 2.0.2•••pg_query 2.0.2 apparently has working ARM support. This change also re-locks sqlint to use the newer version, and generalises the platform spec to avoid being unnecessarily restrictive. As before, other packages which refer to pg_query are unaffected, because they pin an older version of pg_query which is handled separately in the gem-config expressions. Follow-up to #116785 | Steve Purcell | 2021-04-02 | 1 | -3/+3 |
| | * | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-02 | 1 | -1/+1 |
| | |\| | | | | |||||
| | | * | | | | Merge pull request #118131 from alyssais/ruby•••ruby: remove myself as maintainer/CODEOWNER | Sandro | 2021-04-02 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | ruby: remove myself as maintainer/CODEOWNER•••It's been at least a year since I kept up to date with Ruby, and I don't think I really have anything left to offer Nixpkgs in terms of Ruby expertise. | Alyssa Ross | 2021-03-31 | 1 | -1/+1 |
| | * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-02 | 1 | -12/+3 |
| | |\| | | | | | |||||
| | | * | | | | | Merge pull request #118219 from SuperSandro2000/bundix•••bundix: 2.5.0 -> 2.5.1 | Maximilian Bosch | 2021-04-02 | 1 | -12/+3 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | | * | | | | bundix: 2.5.0 -> 2.5.1 | Sandro Jäckel | 2021-04-01 | 1 | -12/+3 |
| | | | |/ / / | |||||
| | * | | | | | Merge staging-next into staging | github-actions[bot] | 2021-04-02 | 1 | -1/+10 |
| | |\| | | | | |||||
| | | * | | | | sqlint: 0.1.10 -> 0.2.0•••- Updates libpg_query to 2.0.0 in gem config, used by pg_query gem 2.0.1 - Continue to support older gem with older libpg_query, for gitlab - Remove redundant gem config override in sqlint expression - Add myself as a maintainer | Steve Purcell | 2021-04-02 | 1 | -1/+10 |
| | | |/ / / | |||||
| | * / / / | gem-config.mathematical: add lasem to rpath•••Co-authored-by: Dylan Baker <dylan@pnwbakers.com> | James Kay | 2021-03-31 | 1 | -5/+7 |
| | |/ / / | |||||
| | * | / | Use minimal git for fetching gems | Michael Francis | 2021-03-26 | 1 | -2/+2 |
| | | |/ | |/| | |||||
| | * | | buildRubyGem: update CFLAGS for ruby 3.0 on Clang | Mario Rodas | 2021-02-22 | 1 | -0/+6 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-03-04 | 1 | -5/+15 |
| |\| | |||||
| | * | gitlab: 13.7.4 -> 13.8.4 (#112836) | Milan | 2021-02-17 | 1 | -5/+15 |
| * | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-02-28 | 12 | -126/+231 |
| |\| | |||||
| | * | Merge pull request #111662 from nicknovitski/remove-ruby-2.5•••Remove Ruby 2.5 | Wael Nasreddine | 2021-02-15 | 1 | -1/+0 |
| | |\ | |||||
| | | * | ruby_2_5: remove | Nick Novitski | 2021-02-03 | 1 | -1/+0 |
| | * | | defaultGemConfig.openssl: build with openssl | Justin Humm | 2021-02-12 | 1 | -0/+4 |
| | |/ | |||||
