Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e2bde6c14fcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 36b27ccf7774
Choose a head ref
Loading
Showing with 1,604 additions and 797 deletions.
  1. +2 −0 lib/systems/doubles.nix
  2. +6 −0 lib/systems/examples.nix
  3. +1 −0 lib/systems/inspect.nix
  4. +2 −0 lib/systems/parse.nix
  5. +12 −0 nixos/doc/manual/release-notes/rl-2103.xml
  6. +2 −2 pkgs/applications/audio/ocenaudio/default.nix
  7. +1 −0 pkgs/build-support/bintools-wrapper/default.nix
  8. +2 −2 pkgs/data/misc/poppler-data/default.nix
  9. +9 −14 pkgs/development/compilers/ghc/8.10.2-binary.nix
  10. +5 −0 pkgs/development/compilers/llvm/10/compiler-rt.nix
  11. +5 −0 pkgs/development/compilers/llvm/5/compiler-rt.nix
  12. +5 −0 pkgs/development/compilers/llvm/6/compiler-rt.nix
  13. +5 −0 pkgs/development/compilers/llvm/7/compiler-rt.nix
  14. +4 −1 pkgs/development/compilers/llvm/7/libc++abi.nix
  15. +5 −0 pkgs/development/compilers/llvm/8/compiler-rt.nix
  16. +5 −0 pkgs/development/compilers/llvm/9/compiler-rt.nix
  17. +21 −6 pkgs/development/interpreters/ruby/default.nix
  18. +2 −2 pkgs/development/libraries/audio/lilv/default.nix
  19. +7 −1 pkgs/development/libraries/dbus/default.nix
  20. +15 −0 pkgs/development/libraries/dbus/docs-reproducible-ids.patch
  21. +2 −2 pkgs/development/libraries/enchant/2.x.nix
  22. +2 −7 pkgs/development/libraries/gtk/2.x.nix
  23. +6 −13 pkgs/development/libraries/json-c/default.nix
  24. +4 −8 pkgs/development/libraries/libass/default.nix
  25. +1 −1 pkgs/development/libraries/libbfd/default.nix
  26. +2 −2 pkgs/development/libraries/libbluray/default.nix
  27. +2 −2 pkgs/development/libraries/libde265/default.nix
  28. +2 −2 pkgs/development/libraries/libgcrypt/default.nix
  29. +10 −8 pkgs/development/libraries/libhandy/default.nix
  30. +2 −2 pkgs/development/libraries/libipt/default.nix
  31. +2 −2 pkgs/development/libraries/libmbim/default.nix
  32. +2 −2 pkgs/development/libraries/libmtp/default.nix
  33. +2 −2 pkgs/development/libraries/libnftnl/default.nix
  34. +1 −1 pkgs/development/libraries/libopcodes/default.nix
  35. +2 −2 pkgs/development/libraries/libqmi/default.nix
  36. +2 −2 pkgs/development/libraries/libshout/default.nix
  37. +3 −0 pkgs/development/libraries/libsoup/default.nix
  38. +2 −2 pkgs/development/libraries/mesa/default.nix
  39. +4 −0 pkgs/development/libraries/qt-5/5.12/default.nix
  40. +15 −0 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
  41. +4 −0 pkgs/development/libraries/qt-5/5.14/default.nix
  42. +15 −0 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
  43. +4 −0 pkgs/development/libraries/qt-5/5.15/default.nix
  44. +15 −0 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
  45. +2 −2 pkgs/development/libraries/webkitgtk/default.nix
  46. +36 −0 pkgs/development/misc/or1k/newlib.nix
  47. +2 −2 pkgs/development/python-modules/GitPython/default.nix
  48. +2 −2 pkgs/development/python-modules/adal/default.nix
  49. +2 −2 pkgs/development/python-modules/aiohttp/default.nix
  50. +2 −2 pkgs/development/python-modules/alembic/default.nix
  51. +2 −2 pkgs/development/python-modules/amazon_kclpy/default.nix
  52. +5 −6 pkgs/development/python-modules/amply/default.nix
  53. +2 −2 pkgs/development/python-modules/apispec/default.nix
  54. +2 −2 pkgs/development/python-modules/astropy/default.nix
  55. +2 −2 pkgs/development/python-modules/atlassian-python-api/default.nix
  56. +2 −2 pkgs/development/python-modules/awkward1/default.nix
  57. +2 −2 pkgs/development/python-modules/aws-adfs/default.nix
  58. +2 −2 pkgs/development/python-modules/bayespy/default.nix
  59. +2 −2 pkgs/development/python-modules/beautifulsoup4/default.nix
  60. +2 −2 pkgs/development/python-modules/bokeh/default.nix
  61. +2 −2 pkgs/development/python-modules/boto3/default.nix
  62. +2 −2 pkgs/development/python-modules/botocore/default.nix
  63. +5 −4 pkgs/development/python-modules/browser-cookie3/default.nix
  64. +2 −2 pkgs/development/python-modules/cffi/default.nix
  65. +2 −2 pkgs/development/python-modules/codecov/default.nix
  66. +2 −2 pkgs/development/python-modules/colorama/default.nix
  67. +2 −2 pkgs/development/python-modules/configparser/default.nix
  68. +2 −2 pkgs/development/python-modules/cornice/default.nix
  69. +2 −2 pkgs/development/python-modules/croniter/default.nix
  70. +2 −2 pkgs/development/python-modules/cvxpy/default.nix
  71. +2 −2 pkgs/development/python-modules/dash-core-components/default.nix
  72. +2 −2 pkgs/development/python-modules/dash-renderer/default.nix
  73. +2 −2 pkgs/development/python-modules/dash-table/default.nix
  74. +2 −2 pkgs/development/python-modules/dash/default.nix
  75. +1 −1 pkgs/development/python-modules/deepmerge/default.nix
  76. +5 −3 pkgs/development/python-modules/deform/default.nix
  77. +2 −2 pkgs/development/python-modules/django-simple-captcha/default.nix
  78. +2 −2 pkgs/development/python-modules/django/2.nix
  79. +2 −2 pkgs/development/python-modules/django/3.nix
  80. +2 −2 pkgs/development/python-modules/django_reversion/default.nix
  81. +2 −2 pkgs/development/python-modules/djangoql/default.nix
  82. +2 −2 pkgs/development/python-modules/djangorestframework/default.nix
  83. +2 −2 pkgs/development/python-modules/dulwich/default.nix
  84. +2 −2 pkgs/development/python-modules/ecpy/default.nix
  85. +2 −2 pkgs/development/python-modules/eventlet/default.nix
  86. +2 −2 pkgs/development/python-modules/faker/default.nix
  87. +4 −3 pkgs/development/python-modules/fiona/default.nix
  88. +2 −2 pkgs/development/python-modules/flake8/default.nix
  89. +4 −4 pkgs/development/python-modules/flask-cors/default.nix
  90. +6 −3 pkgs/development/python-modules/genshi/default.nix
  91. +4 −2 pkgs/development/python-modules/google-auth-oauthlib/default.nix
  92. +1 −1 pkgs/development/python-modules/google_api_core/default.nix
  93. +2 −2 pkgs/development/python-modules/google_auth/default.nix
  94. +2 −2 pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
  95. +1 −1 pkgs/development/python-modules/google_cloud_core/default.nix
  96. +2 −2 pkgs/development/python-modules/google_cloud_dataproc/default.nix
  97. +2 −2 pkgs/development/python-modules/google_cloud_datastore/default.nix
  98. +2 −2 pkgs/development/python-modules/green/default.nix
  99. +2 −2 pkgs/development/python-modules/greenlet/default.nix
  100. +2 −2 pkgs/development/python-modules/gym/default.nix
  101. +2 −2 pkgs/development/python-modules/hidapi/default.nix
  102. +2 −2 pkgs/development/python-modules/hmmlearn/default.nix
  103. +2 −2 pkgs/development/python-modules/identify/default.nix
  104. +6 −3 pkgs/development/python-modules/ipdb/default.nix
  105. +2 −2 pkgs/development/python-modules/ipyvue/default.nix
  106. +2 −2 pkgs/development/python-modules/iso8601/default.nix
  107. +1 −0 pkgs/development/python-modules/iterm2/default.nix
  108. +2 −2 pkgs/development/python-modules/junos-eznc/default.nix
  109. +2 −2 pkgs/development/python-modules/jupyterlab-git/default.nix
  110. +2 −2 pkgs/development/python-modules/jupyterlab/default.nix
  111. +2 −0 pkgs/development/python-modules/jupytext/default.nix
  112. +2 −2 pkgs/development/python-modules/kaggle/default.nix
  113. +2 −2 pkgs/development/python-modules/labelbox/default.nix
  114. +2 −2 pkgs/development/python-modules/ledgerblue/default.nix
  115. +2 −2 pkgs/development/python-modules/matplotlib/default.nix
  116. +2 −2 pkgs/development/python-modules/maxminddb/default.nix
  117. +2 −2 pkgs/development/python-modules/mecab-python3/default.nix
  118. +2 −2 pkgs/development/python-modules/msal/default.nix
  119. +4 −6 pkgs/development/python-modules/munkres/default.nix
  120. +2 −2 pkgs/development/python-modules/murmurhash/default.nix
  121. +2 −1 pkgs/development/python-modules/nbconflux/default.nix
  122. +2 −2 pkgs/development/python-modules/nbformat/default.nix
  123. +2 −2 pkgs/development/python-modules/nest-asyncio/default.nix
  124. +2 −2 pkgs/development/python-modules/notify-py/default.nix
  125. +2 −2 pkgs/development/python-modules/numba/default.nix
  126. +1 −0 pkgs/development/python-modules/numpy/1.16.nix
  127. +3 −2 pkgs/development/python-modules/numpy/default.nix
  128. +2 −2 pkgs/development/python-modules/nunavut/default.nix
  129. +2 −2 pkgs/development/python-modules/openwrt-luci-rpc/default.nix
  130. +2 −2 pkgs/development/python-modules/packet-python/default.nix
  131. +45 −38 pkgs/development/python-modules/pandas/default.nix
  132. +2 −2 pkgs/development/python-modules/pandocfilters/default.nix
  133. +2 −2 pkgs/development/python-modules/parver/default.nix
  134. +2 −2 pkgs/development/python-modules/passlib/default.nix
  135. +2 −2 pkgs/development/python-modules/pastedeploy/default.nix
  136. +2 −2 pkgs/development/python-modules/patator/default.nix
  137. +5 −3 pkgs/development/python-modules/periodictable/default.nix
  138. +4 −3 pkgs/development/python-modules/pg8000/default.nix
  139. +2 −2 pkgs/development/python-modules/phonenumbers/default.nix
  140. +2 −1 pkgs/development/python-modules/premailer/default.nix
  141. +2 −2 pkgs/development/python-modules/preshed/default.nix
  142. +2 −2 pkgs/development/python-modules/prompt_toolkit/default.nix
  143. +2 −2 pkgs/development/python-modules/psd-tools/default.nix
  144. +2 −2 pkgs/development/python-modules/psutil/default.nix
  145. +2 −2 pkgs/development/python-modules/psycopg2/default.nix
  146. +2 −0 pkgs/development/python-modules/pushover-complete/default.nix
  147. +1 −0 pkgs/development/python-modules/py-multihash/default.nix
  148. +2 −2 pkgs/development/python-modules/py4j/default.nix
  149. +2 −2 pkgs/development/python-modules/pybase64/default.nix
  150. +2 −2 pkgs/development/python-modules/pybids/default.nix
  151. +2 −2 pkgs/development/python-modules/pybotvac/default.nix
  152. +2 −2 pkgs/development/python-modules/pychromecast/default.nix
  153. +2 −2 pkgs/development/python-modules/pycoin/default.nix
  154. +2 −2 pkgs/development/python-modules/pycryptodome/default.nix
  155. +2 −2 pkgs/development/python-modules/pycryptodomex/default.nix
  156. +4 −2 pkgs/development/python-modules/pyct/default.nix
  157. +4 −3 pkgs/development/python-modules/pycurl/default.nix
  158. +2 −2 pkgs/development/python-modules/pyexcel-io/default.nix
  159. +2 −2 pkgs/development/python-modules/pyexcel-xls/default.nix
  160. +2 −2 pkgs/development/python-modules/pyhomematic/default.nix
  161. +3 −2 pkgs/development/python-modules/pymupdf/default.nix
  162. +2 −2 pkgs/development/python-modules/pyopencl/default.nix
  163. +2 −2 pkgs/development/python-modules/pyotp/default.nix
  164. +2 −2 pkgs/development/python-modules/pyperclip/default.nix
  165. +2 −2 pkgs/development/python-modules/pyrsistent/default.nix
  166. +2 −2 pkgs/development/python-modules/pyspread/default.nix
  167. +2 −2 pkgs/development/python-modules/pytest-black/default.nix
  168. +8 −4 pkgs/development/python-modules/pytest-flakes/default.nix
  169. +2 −2 pkgs/development/python-modules/pytest-quickcheck/default.nix
  170. +2 −2 pkgs/development/python-modules/pytest-sanic/default.nix
  171. +2 −2 pkgs/development/python-modules/pytest-testmon/default.nix
  172. +2 −2 pkgs/development/python-modules/python-hosts/default.nix
  173. +2 −2 pkgs/development/python-modules/python-rapidjson/default.nix
  174. +2 −2 pkgs/development/python-modules/pytools/default.nix
  175. +2 −2 pkgs/development/python-modules/pywbem/default.nix
  176. +2 −2 pkgs/development/python-modules/reportlab/default.nix
  177. +6 −2 pkgs/development/python-modules/requests-aws4auth/default.nix
  178. +2 −2 pkgs/development/python-modules/robotframework/default.nix
  179. +2 −2 pkgs/development/python-modules/ruamel_ordereddict/default.nix
  180. +2 −2 pkgs/development/python-modules/ruamel_yaml/default.nix
  181. +5 −0 pkgs/development/python-modules/rubymarshal/default.nix
  182. +2 −2 pkgs/development/python-modules/scipy/default.nix
  183. +2 −2 pkgs/development/python-modules/scour/default.nix
  184. +2 −2 pkgs/development/python-modules/scp/default.nix
  185. +24 −0 pkgs/development/python-modules/scramp/default.nix
  186. +4 −3 pkgs/development/python-modules/screeninfo/default.nix
  187. +2 −2 pkgs/development/python-modules/slither-analyzer/default.nix
  188. +2 −2 pkgs/development/python-modules/sounddevice/default.nix
  189. +2 −0 pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
  190. +5 −1 pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
  191. +2 −2 pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
  192. +2 −2 pkgs/development/python-modules/sqlalchemy/default.nix
  193. +2 −2 pkgs/development/python-modules/sqlmap/default.nix
  194. +2 −2 pkgs/development/python-modules/srptools/default.nix
  195. +2 −2 pkgs/development/python-modules/statsmodels/default.nix
  196. +2 −2 pkgs/development/python-modules/tasklib/default.nix
  197. +2 −2 pkgs/development/python-modules/tempora/default.nix
  198. +2 −2 pkgs/development/python-modules/testfixtures/default.nix
  199. +2 −2 pkgs/development/python-modules/textacy/default.nix
  200. +2 −2 pkgs/development/python-modules/toml/default.nix
  201. +2 −2 pkgs/development/python-modules/transitions/default.nix
  202. +2 −2 pkgs/development/python-modules/tubeup/default.nix
  203. +2 −2 pkgs/development/python-modules/txdbus/default.nix
  204. +2 −2 pkgs/development/python-modules/u-msgpack-python/default.nix
  205. +3 −1 pkgs/development/python-modules/update_checker/default.nix
  206. +2 −2 pkgs/development/python-modules/urllib3/default.nix
  207. +2 −2 pkgs/development/python-modules/urwid/default.nix
  208. +2 −2 pkgs/development/python-modules/vcrpy/default.nix
  209. +2 −2 pkgs/development/python-modules/virtualenv/default.nix
  210. +2 −2 pkgs/development/python-modules/xdis/default.nix
  211. +2 −2 pkgs/development/python-modules/xhtml2pdf/default.nix
  212. +2 −2 pkgs/development/python-modules/zeroconf/default.nix
  213. +2 −2 pkgs/development/python-modules/zfec/default.nix
  214. +2 −2 pkgs/development/python-modules/zha-quirks/default.nix
  215. +2 −0 pkgs/development/python-modules/zope_copy/default.nix
  216. +2 −2 pkgs/development/python-modules/zope_interface/default.nix
  217. +2 −2 pkgs/development/python-modules/zopfli/default.nix
  218. +2 −2 pkgs/development/tools/build-managers/cmake/default.nix
  219. +2 −2 pkgs/development/tools/build-managers/meson/default.nix
  220. +13 −15 pkgs/development/tools/documentation/doxygen/default.nix
  221. +45 −20 pkgs/development/tools/misc/binutils/default.nix
  222. 0 ...s/misc/binutils/{ → patches/2.31}/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
  223. 0 ...pment/tools/misc/binutils/{ → patches/2.31}/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
  224. 0 ...t/tools/misc/binutils/{ → patches/2.31}/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
  225. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/always-search-rpath.patch
  226. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/build-components-separately.patch
  227. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/deterministic.patch
  228. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/disambiguate-arm-targets.patch
  229. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/gold-symbol-visibility.patch
  230. 0 pkgs/development/tools/misc/binutils/{ → patches/2.31}/no-plugins.patch
  231. +14 −0 pkgs/development/tools/misc/binutils/patches/2.34/always-search-rpath.patch
  232. +164 −0 pkgs/development/tools/misc/binutils/patches/2.34/build-components-separately.patch
  233. +12 −0 pkgs/development/tools/misc/binutils/patches/2.34/deterministic.patch
  234. +23 −0 pkgs/development/tools/misc/binutils/patches/2.34/disambiguate-arm-targets.patch
  235. +21 −0 pkgs/development/tools/misc/binutils/patches/2.34/no-plugins.patch
  236. +1 −1 pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
  237. +93 −16 pkgs/os-specific/darwin/apple-sdk/default.nix
  238. +115 −113 pkgs/os-specific/darwin/apple-sdk/frameworks.nix
  239. +17 −0 pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix
  240. +148 −0 pkgs/os-specific/darwin/apple-sdk/print-reexports/main.c
  241. +9 −6 pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
  242. +11 −45 pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
  243. +9 −8 pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix
  244. +3 −2 pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
  245. +20 −0 pkgs/os-specific/darwin/darwin-stubs/default.nix
  246. +2 −2 pkgs/os-specific/linux/iptables/default.nix
  247. +128 −42 pkgs/stdenv/darwin/default.nix
  248. +15 −38 pkgs/stdenv/darwin/make-bootstrap-tools.nix
  249. +2 −2 pkgs/stdenv/generic/setup.sh
  250. +4 −2 pkgs/tools/misc/trash-cli/default.nix
  251. +1 −0 pkgs/top-level/aliases.nix
  252. +5 −15 pkgs/top-level/all-packages.nix
  253. +7 −1 pkgs/top-level/darwin-packages.nix
  254. +2 −0 pkgs/top-level/python-packages.nix
2 changes: 2 additions & 0 deletions lib/systems/doubles.nix
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ let
"msp430-none"
"riscv64-none" "riscv32-none"
"vc4-none"
"or1k-none"

"mmix-mmixware"

@@ -61,6 +62,7 @@ in {
mmix = filterDoubles predicates.isMmix;
riscv = filterDoubles predicates.isRiscV;
vc4 = filterDoubles predicates.isVc4;
or1k = filterDoubles predicates.isOr1k;
js = filterDoubles predicates.isJavaScript;

bigEndian = filterDoubles predicates.isBigEndian;
6 changes: 6 additions & 0 deletions lib/systems/examples.nix
Original file line number Diff line number Diff line change
@@ -129,6 +129,12 @@ rec {
platform = {};
};

or1k = {
config = "or1k-elf";
libc = "newlib";
platform = {};
};

arm-embedded = {
config = "arm-none-eabi";
libc = "newlib";
1 change: 1 addition & 0 deletions lib/systems/inspect.nix
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ rec {
isVc4 = { cpu = { family = "vc4"; }; };
isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; };
isOr1k = { cpu = { family = "or1k"; }; };
isJavaScript = { cpu = cpuTypes.js; };

is32bit = { cpu = { bits = 32; }; };
2 changes: 2 additions & 0 deletions lib/systems/parse.nix
Original file line number Diff line number Diff line change
@@ -116,6 +116,8 @@ rec {

vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; };

or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };

js = { bits = 32; significantByte = littleEndian; family = "js"; };
};

12 changes: 12 additions & 0 deletions nixos/doc/manual/release-notes/rl-2103.xml
Original file line number Diff line number Diff line change
@@ -89,6 +89,18 @@
user D-Bus session available also for non-graphical logins.
</para>
</listitem>
<listitem>
<para>
<literal>rubyMinimal</literal> was removed due to being unused and
unusable. The default ruby interpreter includes JIT support, which makes
it reference it's compiler. Since JIT support is probably needed by some
Gems, it was decided to enable this feature with all cc references by
default, and allow to build a Ruby derivation without references to cc,
by setting <literal>jitSupport = false;</literal> in an overlay. See
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link>
for more info.
</para>
</listitem>
<listitem>
<para>
The option <option>fonts.enableFontDir</option> has been renamed to
4 changes: 2 additions & 2 deletions pkgs/applications/audio/ocenaudio/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@

stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.9.2";
version = "3.9.5";

src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv";
sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd";
};


1 change: 1 addition & 0 deletions pkgs/build-support/bintools-wrapper/default.nix
Original file line number Diff line number Diff line change
@@ -186,6 +186,7 @@ stdenv.mkDerivation {
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
else if targetPlatform.isVc4 then "vc4"
else if targetPlatform.isOr1k then "or1k"
else throw "unknown emulation for platform: ${targetPlatform.config}";
in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
4 changes: 2 additions & 2 deletions pkgs/data/misc/poppler-data/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, cmake, ninja }:

stdenv.mkDerivation rec {
name = "poppler-data-0.4.9";
name = "poppler-data-0.4.10";

src = fetchurl {
url = "https://poppler.freedesktop.org/${name}.tar.gz";
sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
};

nativeBuildInputs = [ cmake ninja ];
23 changes: 9 additions & 14 deletions pkgs/development/compilers/ghc/8.10.2-binary.nix
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
# regular builds and GHC bootstrapping.
# This is "useful" for staying within hydra's output limits for at least the
# aarch64-linux architecture.
# Examples of unnecessary files are the bundled documentation and files that
# are only needed for profiling builds.
, minimal ? false
}:

@@ -182,11 +180,15 @@ stdenv.mkDerivation rec {
done
'' +
stdenv.lib.optionalString minimal ''
# Remove profiling objects
# Remove profiling files
find $out -type f -name '*.p_o' -delete
find $out -type f -name '*.p_hi' -delete
find $out -type f -name '*_p.a' -delete
rm $out/lib/ghc-*/bin/ghc-iserv-prof
# Remove docs
rm -r $out/share/{doc,man}
# Hydra will redistribute this derivation, so we have to keep the docs for
# legal reasons (retaining the legal notices etc)
# As a last resort we could unpack the docs separately and symlink them in.
# They're in $out/share/{doc,man}.
'';

doInstallCheck = true;
@@ -210,18 +212,11 @@ stdenv.mkDerivation rec {
enableShared = true;
};

meta = let
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
in {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
license = stdenv.lib.licenses.bsd3;

# The minimal variation can not be distributed because it removes the
# documentation, including licensing information that is required for
# distribution.
inherit platforms;
hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
maintainers = with stdenv.lib.maintainers; [ lostnet ];
};
}
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/10/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/5/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/6/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/7/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
5 changes: 4 additions & 1 deletion pkgs/development/compilers/llvm/7/libc++abi.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, cmake, fetch, libcxx, llvm, version
, standalone ? false
# on musl the shared objects don't build
, enableShared ? ! stdenv.hostPlatform.isMusl }:

@@ -20,7 +21,9 @@ stdenv.mkDerivation {
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
'';

cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
cmakeFlags =
stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";

installPhase = if stdenv.isDarwin
then ''
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/8/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
5 changes: 5 additions & 0 deletions pkgs/development/compilers/llvm/9/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
] ++ stdenv.lib.optionals (bareMetal) [
"-DCOMPILER_RT_OS_DIR=baremetal"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
# The compiler-rt build infrastructure sniffs supported platforms on Darwin
# and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
# when it tries to use libc++ and libc++api for i386.
"-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
];

outputs = [ "out" "dev" ];
27 changes: 21 additions & 6 deletions pkgs/development/interpreters/ruby/default.nix
Original file line number Diff line number Diff line change
@@ -44,11 +44,22 @@ let
, groff, docSupport ? true
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
# ruby -e "puts RbConfig::CONFIG['configure_args']"
# puts a reference to the C compiler in the binary.
# This might be required by some gems at runtime,
# but we allow to strip it out for smaller closure size.
, removeReferencesTo, removeReferenceToCC ? true
# By default, ruby has 3 observed references to stdenv.cc:
#
# - If you run:
# ruby -e "puts RbConfig::CONFIG['configure_args']"
# - In:
# $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
# Or (usually):
# $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
#
# Since some Gems require JIT support, there's probably no
# escape from this reference. Hence, it was decided to enable this
# feature by default, as it's enabled by default by ruby's ./configure
# script. If you'd like to have a ruby without reference to cc, setting
# jitSupport to false should remove all known references mentioned above.
, removeReferencesTo, jitSupport ? true
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
@@ -121,6 +132,7 @@ let

configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!jitSupport) "--disable-jit-support"
++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [
# on darwin, we have /usr/include/tk.h -- so the configure script detects
@@ -157,11 +169,14 @@ let
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
${
lib.optionalString removeReferenceToCC ''
lib.optionalString (!jitSupport) ''
# Get rid of the CC runtime dependency
${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \
$out/lib/libruby*
${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \
$out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
''
}
# Bundler tries to create this directory
4 changes: 2 additions & 2 deletions pkgs/development/libraries/audio/lilv/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "lilv";
version = "0.24.8";
version = "0.24.10";

src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a";
sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi";
};

patches = [ ./lilv-pkgconfig.patch ];
8 changes: 7 additions & 1 deletion pkgs/development/libraries/dbus/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,13 @@ stdenv.mkDerivation rec {
sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
};

patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
patches = [
# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
# Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
# expected in version 1.14
./docs-reproducible-ids.patch
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);

postPatch = ''
substituteInPlace tools/Makefile.in \
15 changes: 15 additions & 0 deletions pkgs/development/libraries/dbus/docs-reproducible-ids.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200
+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100
@@ -870,8 +870,10 @@
.PRECIOUS: Makefile


+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
@DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<

@DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<
4 changes: 2 additions & 2 deletions pkgs/development/libraries/enchant/2.x.nix
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "enchant";
version = "2.2.12";
version = "2.2.13";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb";
sha256 = "084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga";
};

nativeBuildInputs = [
9 changes: 2 additions & 7 deletions pkgs/development/libraries/gtk/2.x.nix
Original file line number Diff line number Diff line change
@@ -12,12 +12,9 @@ assert cupsSupport -> cups != null;

with stdenv.lib;

let
pname = "gtk+";
version = "2.24.32"; # remove passthru on next update
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gtk+";
version = "2.24.32";

src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";
@@ -75,8 +72,6 @@ stdenv.mkDerivation rec {
'';

passthru = {
# passthru to prevent rebuild but allow pname and version
inherit pname version;
gtkExeEnvPostBuild = ''
rm $out/lib/gtk-2.0/2.10.0/immodules.cache
$out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
Loading