Jules Aguillon
6965ac6cce
rubyPackages.mail: init at 2.8.1
...
The `mail` gem has been removed in 3b953b5a69
2023-02-13 19:19:09 +01:00
Anthony Roussel
6998035ed5
bundler: 2.4.5 -> 2.4.6
2023-01-31 22:01:14 +01:00
Stephen Checkoway
cd7476bac9
psych: add libyaml as build input
...
Starting with version 5, psych no longer bundles libyaml
(https://github.com/ruby/psych/releases/tag/v5.0.0 ) and the psych gem
cannot be built.
This adds libyaml as a build input.
2023-01-28 17:38:32 -05:00
Anthony Roussel
5b5ace4f17
bundler: 2.4.4 -> 2.4.5
2023-01-23 04:36:02 +01:00
Nick Cao
332740a9a7
Merge pull request #211762 from superherointj/mark-broken-rubyPackages.libv8
...
rubyPackages.libv8: mark broken
2023-01-23 09:22:03 +08:00
Mario Rodas
473a4f5b2e
Merge pull request #211820 from anthonyroussel/bundler_2_4_4
...
bundler: 2.4.3 -> 2.4.4
2023-01-22 09:25:52 -05:00
Yureka
9f05e44db6
buildRubyGem: don't use the bash 'type' variable name ( #211899 )
...
https://github.com/NixOS/nixpkgs/issues/211671
There is also a fix with an stdenv rebuild in staging, but we don't want to wait so long...
2023-01-21 16:43:07 +01:00
Anthony Roussel
e1729f54e3
bundler: 2.4.3 -> 2.4.4
2023-01-20 21:43:14 +01:00
superherointj
82d7d64d3a
rubyPackages.libv8: mark broken
2023-01-20 09:23:52 -03:00
Andrew Marshall
baf1f1293b
ruby: Fix withPackages on darwin with makeBinaryWrapper
...
See also https://github.com/NixOS/nixpkgs/pull/161298
2023-01-11 11:28:41 -05:00
Anthony Roussel
09864251a2
bundler: 2.4.2 -> 2.4.3
2023-01-06 22:59:58 +01:00
Anthony Roussel
0067737a8b
bundler: 2.3.26 -> 2.4.2
2023-01-02 14:43:58 +01:00
figsoda
ec8cb34358
treewide: fix typos
2022-12-17 19:39:44 -05:00
Martin Weinelt
fe8eef1ae4
Merge remote-tracking branch 'origin/master' into staging-next
2022-12-04 22:06:42 +01:00
Jan Tojnar
42a68e6a36
bundlerUpdateScript: Fix evaluation with allowAliases = false
...
Reverts 38ffd641e0
2022-12-03 23:40:32 +01:00
github-actions[bot]
aff62e907a
Merge master into staging-next
2022-11-30 06:01:30 +00:00
sternenseemann
38ffd641e0
bundlerUpdateScript: use Nix 2.3
...
The script assumes that nix(1) can be used without any flags which
is no longer the case. We can easily use Nix 2.3 as a workaround
until someone else musters the willpower to adjust this script for
Nix 2.11.
2022-11-29 23:25:42 +01:00
github-actions[bot]
f1f9569cde
Merge staging-next into staging
2022-11-27 00:03:04 +00:00
Robert Schütz
1710b52c6e
rubyPackages.libv8: use python3
2022-11-25 20:03:33 -08:00
Anthony Roussel
86b196f155
bundler: add meta.changelog
2022-11-17 22:06:22 +01:00
Anthony Roussel
11563bf92f
bundler: 2.3.25 -> 2.3.26
2022-11-17 22:06:20 +01:00
Victor Engmark
6ac6beaf83
jekyll-webmention_io: init at 3.3.6
2022-11-11 16:56:55 +13:00
Anthony Roussel
84ef2aad5d
bundler: 2.3.24 -> 2.3.25
2022-11-06 10:57:04 +01:00
Victor Engmark
13736965d8
jekyll-favicon: init at 1.1.0
...
Closes #198542 .
2022-10-30 20:14:41 +13:00
github-actions[bot]
142c743774
Merge master into staging-next
2022-10-29 06:01:19 +00:00
Stef Dunlap
76af23cc82
rubyPackages.git: init at 1.12.0
...
Source https://rubygems.org/gems/git/versions/1.12.0
2022-10-26 10:23:12 -04:00
github-actions[bot]
d079720429
Merge staging-next into staging
2022-10-22 12:01:58 +00:00
github-actions[bot]
71e4896d63
Merge master into staging-next
2022-10-22 12:01:25 +00:00
Anthony Roussel
5ef2aa2f6d
bundler: 2.3.23 -> 2.3.24
2022-10-19 23:41:24 +02:00
Timothy Stott
7f3b2bc060
rubyPackages.tty-command: init at 0.10.1
2022-10-17 20:11:19 +01:00
Timothy Stott
9436763c56
rubyPackages.tty-option: init at 0.2.0
2022-10-17 20:11:18 +01:00
github-actions[bot]
3834216ec6
Merge master into staging-next
2022-10-17 18:10:17 +00:00
Stanisław Pitucha
aceb5cd69e
rubyPackages.grpc: fix darwin build
2022-10-17 22:44:37 +11:00
Martin Weinelt
5c51f3d548
Merge pull request #195245 from ncfavier/weechat-docs
2022-10-13 23:11:25 +02:00
Vladimír Čunát
00a757ed3f
Merge branch 'master' into staging
2022-10-13 08:27:55 +02:00
Vladimír Čunát
81e445e508
rubyPackages.*: satisfy pcre* requirements in GTK stack
...
Some of them want both versions. Suspicious but OK I guess.
2022-10-12 18:33:04 +02:00
Naïm Favier
d26276e725
weechat: re-enable docs
...
The doc build was failing because of an unpatched `/usr/bin/env` shebang
in the `pygments.rb` gem, and weechat uses asciidoctor with the pygments
highlighter. Adding `python3` to `pygments.rb`'s `buildInputs` fixes it.
2022-10-11 11:09:52 +02:00
github-actions[bot]
cdfb8a30a4
Merge staging-next into staging
2022-10-08 12:02:12 +00:00
Vladimír Čunát
6565abc264
Merge branch 'master' into staging-next
2022-10-08 10:20:07 +02:00
Mario Rodas
bff095ca21
Merge pull request #185702 from ilkecan/rubyPackages-set-meta-mainProgram
...
rubyPackages: set meta.mainProgram
2022-10-06 22:14:04 -05:00
Mario Rodas
7a2dd2ecf9
Merge pull request #192860 from raboof/ruby-move-towards-3.1
...
ruby: move towards 3.1
2022-10-06 21:16:44 -05:00
Arnout Engelen
c5e2f3c066
ruby: move towards ruby 3
...
Currently, `pkgs.ruby` is ruby 2.7.6, which is in 'security updates
only' mode and scheduled to go EOL April 2023. Updating `pkgs.ruby`
to be ruby 3.1 would be a rather large change, but using ruby 3 to
bootstrap building ruby itself would be a nice first step in that
direction.
Tested with asciidoctor that this indeed now allows building a ruby
application without getting ruby 2.7 in the build closure.
Also fixes #192729
2022-10-06 17:09:38 +02:00
Anthony Roussel
82d5854fcc
bundler: 2.3.22 -> 2.3.23
2022-10-06 16:41:41 +02:00
Artturin
0734f54ef2
treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
...
found with nixpkgs-lint
2022-09-26 17:53:26 +03:00
github-actions[bot]
9130789e80
Merge staging-next into staging
2022-09-13 06:24:05 +00:00
Mario Rodas
7cd86e7b9a
Merge pull request #190859 from viraptor/sqlite-simplify
...
rubyPackages.sqlite3: simplify build flags
2022-09-13 00:36:36 -05:00
Frederik Rietdijk
3086301ac4
Merge staging-next into staging
2022-09-12 19:49:24 +02:00
Stanisław Pitucha
5f4bfbbe11
rubyPackages.sqlite3: simplify build flags
2022-09-12 09:29:31 +10:00
github-actions[bot]
6ec60fd222
Merge master into staging-next
2022-09-11 18:01:19 +00:00
Stanisław Pitucha
3e2341b082
rubyPackages.sqlite3: fix building for >= 1.5.0
2022-09-11 16:27:02 +02:00
Vladimír Čunát
a3d7dfe8a3
Merge branch 'master' into staging-next
2022-09-11 08:43:51 +02:00
Stanisław Pitucha
099df1f9ac
v8: fix darwin build
2022-09-10 23:52:16 +10:00
Anthony Roussel
b51b1f1e9d
bundler: 2.3.21 -> 2.3.22
2022-09-09 19:25:49 +02:00
Vladimír Čunát
0c61634ac9
Re-Revert "Merge #188995 : bundler: 2.3.20 -> 2.3.21"
...
Moved from master to staging.
This reverts commit 21de2b973f
2022-09-02 07:33:54 +02:00
Vladimír Čunát
11656ec9a9
Merge branch 'master' into staging-next
2022-09-02 07:33:30 +02:00
Vladimír Čunát
21de2b973f
Revert "Merge #188995 : bundler: 2.3.20 -> 2.3.21"
...
Moving to staging branch, as it's a huge rebuild.
This reverts commit 6511d3fe52cf40140a53
2022-09-02 07:30:12 +02:00
github-actions[bot]
761072ccdf
Merge master into staging-next
2022-09-02 00:02:02 +00:00
Anthony Roussel
d055a2ec1e
bundler: add meta
2022-09-01 16:24:13 +02:00
Anthony Roussel
6db2d6e113
bundler: 2.3.20 -> 2.3.21
2022-09-01 16:24:12 +02:00
Anthony Roussel
6088bad88a
bundler: add passthru.updateScript
2022-09-01 16:24:12 +02:00
Vladimír Čunát
f08ac2c92b
Merge branch 'master' into staging-next
2022-08-29 08:58:52 +02:00
Artturi
79c42aa06c
Merge pull request #186564 from Artturin/crossevalfixes
...
Fixes for cross-compilation
2022-08-27 17:49:00 +03:00
ajs124
03d1fd84d5
gemConfig/openssl: pin to openssl_1_1
2022-08-17 20:16:24 +02:00
Artturin
f97c3252e8
bundlerApp: accept nativeBuildInputs
...
69dcb1a2c0
2022-08-16 13:14:19 +03:00
Martin Weinelt
7cc655c695
Merge pull request #183718 from winterqt/update-gitlab
2022-08-12 12:12:54 +02:00
Winter
8fb9c2cdd7
bundlerEnv: allow copying additional paths alongside config files
2022-08-11 13:26:34 -04:00
Anthony Roussel
f84b3c9f0e
bundler: 2.3.9 -> 2.3.20
2022-08-11 13:58:39 +02:00
ilkecan
7a75ad1e19
rubyPackages: set meta.mainProgram
2022-08-08 20:09:36 +00:00
github-actions[bot]
8aaeccd647
Merge master into staging-next
2022-07-26 06:02:16 +00:00
Sandro
1539747c7e
bundlerApp: set meta.mainProgram
2022-07-25 15:46:23 +02:00
Vladimír Čunát
4ba8bc7d40
Merge branch 'master' into staging-next
2022-07-24 09:44:09 +02:00
Andrew Marshall
ffd3da44f3
defaultGemConfig.grpc: Fix build on v1.48.0+
...
Upstream commit 0a5d9828c1f6b32e8462a00029b1ba2a720c867b changed how the
extension build script detects an Apple toolchain; adjust accordingly by
forcing it to be false. Keep both fixes so this is more compatible.
2022-07-19 19:32:19 -04:00
Artturin
271665ec4c
bundlerApp: put makeWrapper in nativeBuildInputs
...
fixes cross 'error: attribute 'runtimeShell' missing'
2022-07-14 22:08:56 +03:00
Mario Rodas
ce577b822e
Merge pull request #175871 from Artturin/fixcross1
...
buildRubyGem: fix bundix cross
2022-07-01 23:01:26 -05:00
Artturin
6b8ce2acdf
buildRubyGem: inherit libobjc from darwin
2022-07-01 19:19:11 +03:00
Artturin
a720bc44c2
buildRubyGem: fix bundix cross
...
allows building bundix but most ruby gems still fail with
```
++ gem install --local --force --http-proxy http://nodtd.invalid --ignore-dependencies --install-dir /nix/store/...-ruby-aarch64-unknown-linux-gnu2.7.6-nio4r-2.5.8-aarch64-unknown-linux-gnu/lib/ruby/gems/2.7.0
--build-root / --backtrace --no-env-shebang -N /nix/store/...-nio4r-2.5.8.gem --
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 8: require: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 9: require: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 10: require: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 12: required_version: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 14: unless: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 15: abort: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 16: end: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 18: args: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 20: begin: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 21: Gem::GemRunner.new.run: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 22: rescue: command not found
/nix/store/...-ruby-aarch64-unknown-linux-gnu-2.7.6/bin/gem: line 23: exit: e.exit_code: numeric argument required
```
2022-07-01 19:17:19 +03:00
Martin Weinelt
a24431e56f
Merge pull request #162808 from mweinelt/schleuder
...
schleuder: init
2022-06-24 21:38:22 +02:00
Linus Heckemann
2dbaea9186
bundler bin stubs: Squelch sudo warning
...
@ruby maintainers: please feel free to revert this and let me know,
should it cause any problems.
Stuff that's in the store shouldn't be writable! So let's disable
Bundler's requires_sudo? method, which checks if some files are
writable and suggests using sudo if not, entirely.
Previously, schleuder-cli would print to stderr when run:
Following files may not be writable, so sudo is needed:
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/build_info
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bundler
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/cache
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/doc
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/extensions
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/gems
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/plugins
/nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/specifications
2022-06-24 15:30:16 -04:00
Benno Bielmeier
d0af7c06ac
gollum: fix shebang in bin/gollum
...
In the v5.3.0 release of gollum, the shebang in `bin/gollum` changed,
breaking the package build:
https://github.com/gollum/gollum/compare/v5.2.3..v5.3.0#diff-0108eafd2bcdf5151e078efec0119e63431569fca19b46660c9b8d9b7cdd6cf5R1
2022-06-17 14:26:38 +02:00
github-actions[bot]
999a16ca63
Merge staging-next into staging
2022-04-14 12:02:14 +00:00
ppenguin
67b8f5cfff
rubyPackages: add pandocomatic ( #164545 )
...
* add pandocomatic
* upddate ruby-packages and add pandocomatic
2022-04-14 05:39:57 -05:00
Seggy Umboh
d835815469
rubyPackages: add dip
2022-04-13 13:55:44 -07:00
github-actions[bot]
17eb9da14b
Merge staging-next into staging
2022-04-04 12:06:26 +00:00
Mario Rodas
0af35df7b8
Merge pull request #161494 from viraptor/gems
...
gemConfig update for exiv and maxmind
2022-04-04 06:44:24 -05:00
Doron Behar
4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir
2022-03-24 13:51:27 +02:00
Ben Siraphob
c5a6e4a0fc
bundler: 2.3.6 -> 2.3.9
2022-03-21 23:44:52 -05:00
Mario Rodas
b1bfde2d32
Merge pull request #151773 from applePrincess/fix-ruby-libvirt
...
rubyPackages.ruby-libvirt: remove patch
2022-03-19 12:01:50 -05:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd with --chdir
...
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
Sandro Jäckel
a734cbbd5d
wrappedRuby: add test for binaryWrapper
2022-03-09 16:13:59 +01:00
Stanisław Pitucha
6d84e80741
gemConfig update for exiv and maxmind
...
Add the build flags for the native extension gems exiv2 and maxminddb.
2022-02-23 21:17:31 +11:00
Tobias Bergkvist
e377a4d312
ruby-modules/bundler-env: Replace makeWrapper with makeBinaryWrapper to make bundled ruby apps work on macOS
2022-02-22 01:12:57 +01:00
FliegendeWurst
c053bd3a4b
bundler: 2.2.24 -> 2.3.6
2022-01-28 09:36:34 +01:00
Eelco Dolstra
55ae086747
pathDerivation: Copy path
...
Otherwise you end up with a derivation that refers to the original
path (which is not in the Nix store and not accessible to
builders). This caused the derivation paths for the docbookrx package
(removed on master) to depend on the location of the nixpkgs source
tree.
2022-01-24 20:12:19 +01:00
Vincent Haupert
c859908cd6
rubyPackages.rdiscount: use lib from pkgs.discount
2022-01-19 14:06:28 +01:00
Lein Matsumaru
11d686de12
rubyPackages.ruby-libvirt: remove patch
2021-12-22 15:23:58 +00:00
Mario Rodas
dec246428e
rubyPackages: update
2021-12-10 04:20:00 +00:00
Finn Behrens
3f8e12cc87
gitaly: fix x86_64-darwin build
2021-12-09 19:57:32 +01:00
Sergei Trofimovich
05d223f53e
rubyPackages.zookeeper: drop outdated patch
...
Without the change build fails as:
patch -p0 < patches/zkc-3.4.5-gcc-8.patch 2>&1
patching file zkc-3.4.5/c/src/zookeeper.c
Hunk #1 FAILED at 3418.
1 out of 1 hunk FAILED -- saving rejects to file zkc-3.4.5/c/src/zookeeper.c.rej
2021-12-04 10:59:46 +00:00
happysalada
58776b8914
asciidoctor: 2.0.15 -> 2.0.16; darwin fix
2021-11-04 17:13:05 +09:00
R. Ryantm
8aa05c73c1
rbenv: 1.1.2 -> 1.2.0
2021-10-29 01:13:11 +00:00
Sergei Trofimovich
c6b949c09c
ruby_2_6, rubyPackages_2_6: drop unused package
2021-10-22 08:46:57 +01:00
Michael Fellinger
973639dcf1
bundlerEnv.wrappedRuby: inherit gemPath and meta
2021-10-07 12:03:26 +02:00
Mario Rodas
d32b07e6df
Merge pull request #138405 from alyssais/bundlerEnv
...
bundlerEnv: fix documentation argument
2021-09-29 13:18:52 -05:00
Zak B. Elep
78c2be85d7
rubyPackages.ansi: init at 1.5.0 ( #138240 )
2021-09-20 11:57:09 +02:00
Alyssa Ross
aafa2db61a
bundlerEnv: fix documentation argument
...
This was ignored before. Now that it's passed through, it's possible
to do
(bundlerEnv {
name = "...";
gemdir = ./.;
document = [ "ri" ];
}).env
and get an environment where ri can be used to read gem documentation.
2021-09-18 10:58:24 +00:00
github-actions[bot]
77893d86c2
Merge master into staging-next
2021-09-09 06:01:04 +00:00
Uri Baghin
36a77bbe7e
fluentd: remove fluent-plugin-scribe
2021-09-08 17:10:19 +10:00
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 bc5c0c559f44dac5f5c6
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 50d604314e187d0371ab
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
