Commit Graph

383 Commits

Author SHA1 Message Date
Jan Tojnar
807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Mario Rodas
50a5bfaaff rubyPackages: add github-pages 2021-08-09 18:01:00 -05:00
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
ajs124
4c9732135e
Merge pull request #131644 from deviant/bumpndler
bundler: 2.2.20 -> 2.2.24
2021-08-03 21:47:34 +02:00
Enno Richter
7ad795da18 snmpcheck: init at 1.9 2021-08-01 09:46:29 +02:00
Mario Rodas
8cd1711b04
Merge pull request #110703 from zarelit/issue_85989_ignore_bundle_path
bundlerEnv: ignore bundler configuration file
2021-07-31 17:50:47 -05:00
Frederik Rietdijk
9b2b860bbc gem-config: stay with python2 2021-07-27 20:37:05 +02:00
V
01ccfa4859 bundler: 2.2.20 -> 2.2.24 2021-07-27 08:01:55 +02:00
Sandro
d5bd34ebf2
treewide: convert phases that contain ":" to dont* = true (#130500) 2021-07-18 23:42:48 +02:00
Felix Buehler
e023025ee0 various: cleanup of "inherit version;" 2021-07-17 22:39:35 +02:00
Mario Rodas
0b1132dba5 buildRubyGem: by default use Ruby's platforms 2021-07-16 04:20:00 +00:00
Alexander Shestakov
cf36424009
Merge branch 'master' into master 2021-07-12 12:50:28 +03:00
Mario Rodas
6d21862d83 solargraph: move solargraph to rubyPackages 2021-07-07 04:20:00 +00:00
Anna Kudriavtsev
4c533ea1aa bundler: 2.1.4 -> 2.2.20 2021-06-16 21:27:24 -07:00
Sandro
91f69cd0ad
Merge pull request #123445 from jnetod/zhf-ruby-libvirt
rubyPackages.ruby-libvirt: fix build with ruby 3.x
2021-05-22 20:13:48 +02:00
Mario Rodas
b9c3590ee2 rubyPackages: update 2021-05-21 04:20:00 +00:00
J. Neto
0d6b6931b7 rubyPackages.ruby-libvirt: fix build with ruby 3.x 2021-05-19 20:43:29 -03:00
Vladimír Čunát
9f054b5e1a
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
2021-05-07 15:36:40 +02:00
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