public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source 
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar
2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/ruby/patchsets.nix
+1 -1
View File
@@ -11,7 +11,7 @@
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"3.0.0" = ops useRailsExpress [
"3.0.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
];