Commit graph

363 commits

Author SHA1 Message Date
github-actions[bot] 8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
midchildan 62806df678
mikutter: 4.0.0 -> 4.1.4 (#119454) 2021-04-17 19:17:13 +02:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
ajs124 692e6c9cf5 Revert "Merge pull request #117702 from edude03/patch-4"
This reverts commit bc5c0c559f, reversing
changes made to 44dac5f5c6.
2021-04-15 20:39:02 +02:00
github-actions[bot] dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Ryan Mulligan bc5c0c559f
Merge pull request #117702 from edude03/patch-4
gems: Added mime info path for mimemagic
2021-04-15 11:01:57 -07:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Masanori Ogino 1e0f9d1f24
kramdown-rfc2629: 1.3.37 -> 1.4.1 and move to rubyPackages (#117283) 2021-04-13 15:01:56 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Sandro 5ab8127b91
Merge pull request #115582 from jdelStrother/bundler-override
bundlerEnv: Allow overriding bundler
2021-04-12 20:11:18 +02:00
Dmitry Kalinkin 219590673c
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
2021-04-08 22:42:26 -04:00
github-actions[bot] 85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
github-actions[bot] 8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
talyz 9b30cda2f6 gitlab: 13.9.4 -> 13.10.2 2021-04-07 23:23:24 +02:00
Mario Rodas e36ce4359f bundix: add marsam to maintainers 2021-04-07 04:20:00 +00:00
Jan Tojnar 70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Thomas Bereknyei a10183d3ec ruby: reproducible
Generated Makefile's were nested deeper than the existing rm would be
able to remove.
2021-04-05 23:14:12 -04:00
Sandro Jäckel dcb501f993
kerberos: deprecate alias 2021-04-04 03:18:56 +02:00
github-actions[bot] 74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Sandro 11910695f6
Merge pull request #118296 from purcell/ruby-pg_query-2.0.2
defaultGemConfig.pg_query: 2.0.1 -> 2.0.2
2021-04-03 02:14:47 +02:00
github-actions[bot] b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Sandro 96f62260a9
Merge pull request #118131 from alyssais/ruby
ruby: remove myself as maintainer/CODEOWNER
2021-04-02 18:51:18 +02:00
github-actions[bot] 60739e07d2
Merge master into staging-next 2021-04-02 12:06:12 +00:00
Maximilian Bosch 6ddf9649ae
Merge pull request #118219 from SuperSandro2000/bundix
bundix: 2.5.0 -> 2.5.1
2021-04-02 11:54:55 +02:00
Steve Purcell dde94e3d83 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
2021-04-02 21:02:54 +13:00
github-actions[bot] b719e2423f
Merge staging-next into staging 2021-04-02 06:05:30 +00:00
Steve Purcell b092bdccfa 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
2021-04-02 00:28:17 -04:00
Sandro Jäckel eaba4b04af
bundix: 2.5.0 -> 2.5.1 2021-04-01 11:15:35 +02:00
James Kay b81f7f91fa gem-config.mathematical: add lasem to rpath
Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
2021-03-31 14:06:45 -07:00
Alyssa Ross 53f49682ee
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.
2021-03-31 09:27:35 +00:00
Michael Francis ae4fac9f4b
Use minimal git for fetching gems 2021-03-26 17:04:37 -04:00
Michael Francis cba7c22f61
Update pkgs/development/ruby-modules/gem-config/default.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-27 04:51:32 +08:00
Michael Francis 0c79724680
remove whitespace 2021-03-26 10:58:35 -04:00
Michael Francis 445aa4663f
Added mime info path for mimemagic 2021-03-26 10:56:07 -04:00
Jonathan del Strother 878bae1142
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.
2021-03-10 10:44:14 +00:00
Mario Rodas 7121ef61da buildRubyGem: update CFLAGS for ruby 3.0 on Clang 2021-02-22 04:20:00 +00:00
Milan bd4b22a87a
gitlab: 13.7.4 -> 13.8.4 (#112836) 2021-02-17 22:55:14 +01:00
Wael Nasreddine 2df97e4b0a
Merge pull request #111662 from nicknovitski/remove-ruby-2.5
Remove Ruby 2.5
2021-02-15 10:21:46 -08:00
Justin Humm 8d27886e08
defaultGemConfig.openssl: build with openssl 2021-02-12 15:36:38 +00:00
Nick Novitski eda1eab733 ruby_2_5: remove 2021-02-03 12:10:32 -08:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
zowoq 0ebfeaeca1 bundix: add final newline patch 2021-01-22 07:18:04 +10:00
github-actions[bot] b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Pavol Rusnak cf2a67fef3
pkgs/development: stdenv.lib -> lib
this takes care of the following folders in pkgs/development:
* arduino
* chez-modules
* go-packages
* guile-modules
* idris-modules
* perl-modules
* r-modules
* ruby-modules
2021-01-17 19:11:59 +01:00
Jan Tojnar 2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +01:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Mario Rodas 7217c05c66
Merge pull request #108831 from marsam/update-solargraph
solargraph: 0.39.17 -> 0.40.1
2021-01-09 18:26:25 -05:00