Commit Graph

41611 Commits

Author SHA1 Message Date
Vladimír Čunát f37443483e
libdrm: 2.4.84 -> 2.4.88 2017-11-27 13:05:07 +01:00
Vladimír Čunát 529c5c50b1
gnutls: 3.5.15 -> 3.6.1
No breaking changes expected, as the ABI is still 3.4.0.
2017-11-27 12:42:11 +01:00
Vladimír Čunát 40a2973f14
Merge #31853: nettle: 3.3 -> 3.4 2017-11-27 12:24:16 +01:00
Vladimír Čunát 6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
Vladimír Čunát 6589519174
Merge #31453: meson: library install paths for g-ir-scanner 2017-11-27 12:13:34 +01:00
Vladimír Čunát 337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
John Ericson 1c44d5efc6
Merge pull request #32098 from obsidiansystems/binPrefix
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
2017-11-27 03:20:53 -05:00
John Ericson e755a8a27d treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
John Ericson bef4379b7d Merge @orivej's master history cleanup commit into staging
This is a good commit, and so I want it to be the most recent common ancester
of master and staging. Almost no files are changed; the point is history.
2017-11-27 02:42:07 -05:00
Jan Tojnar 4920d4fff2
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-26 03:11:00 +01:00
Jan Tojnar 289134fddf
meson: pass library install paths to g-ir-scanner
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information some way.

This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
2017-11-26 03:10:55 +01:00
Jan Tojnar 5a4320ab59
gnome3: get rid of extraneous NIX_CFLAGS_COMPILE 2017-11-26 03:10:53 +01:00
Jan Tojnar c8b58a47fc
gvfs: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:52 +01:00
Jan Tojnar 5a3b7ef2e7
gnome3: use the same version of Vala 2017-11-26 03:10:50 +01:00
Jan Tojnar 1c1d677149
gnome3: dependency tweaks 2017-11-26 03:10:49 +01:00
Jan Tojnar 60dbe7eea4
granite: 0.4.0.1 → 0.4.1 2017-11-26 03:10:48 +01:00
Orivej Desh 29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc
stdenv: Move devhelp books to outputDevdoc
2017-11-25 23:14:47 +00:00
Jörg Thalheim 5233333265
Merge pull request #32022 from bachp/gitlab-runner-10.2.0
gitlab-runner: 10.1.0 -> 10.2.0
2017-11-25 11:12:43 +00:00
Pascal Bach a1c98a8f78 gitlab-runner: 10.1.0 -> 10.2.0 2017-11-25 10:46:45 +01:00
Frederik Rietdijk d087463b48 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 09:13:36 +01:00
Frederik Rietdijk c06bc73222 python3.pkgs.urwid: remove several tests 2017-11-25 09:03:32 +01:00
Frederik Rietdijk ddbe2dda4b python.pkgs.tqdm: remove performance tests 2017-11-25 08:49:32 +01:00
Frederik Rietdijk d34aeaf031 python.pkgs.jedi: unpin parso dependency 2017-11-25 08:46:51 +01:00
Frederik Rietdijk 44e98de414 python.pkgs: maintenance updates 2017-11-24 20:36:20 +01:00
Frederik Rietdijk 0f50d5ac19 python.pkgs.trollius: use optionals instead of optional, fixes eval for neovim
Eval of neovim was broken at
40851a4d26 (commitcomment-25817374).
2017-11-24 20:14:28 +01:00
Frederik Rietdijk 7a13e5a7df Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-24 19:58:07 +01:00
Vladimír Čunát 7dfa97969a
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
2017-11-24 18:36:54 +01:00
Peter Simons 1743953cc5 haskell-Cabal: bump 2.x branch to version 2.0.1.0 2017-11-24 18:34:32 +01:00
Peter Simons a2cd405a16 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7 from Hackage revision
31b0f83319.
2017-11-24 18:34:28 +01:00
Tim Steinbach 0a123ae574
gradle: 4.3 -> 4.3.1 2017-11-24 08:30:22 -05:00
Frederik Rietdijk 59d294dd7d
Merge pull request #31923 from kquick/thespian
thespian: Python library init at 3.8.3
2017-11-24 07:49:56 +01:00
Jan Tojnar 2bffd5f45f
libxmlxx3: split out devdoc output 2017-11-24 02:14:46 +01:00
Jan Tojnar c151a86dbc
libxmlxx: split out devdoc output 2017-11-24 02:14:32 +01:00
Jan Tojnar 46ee9d4c34
vala: split out devdoc output 2017-11-24 02:14:13 +01:00
adisbladis d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
adisbladis 4ae5f31403 pythonPackages.locustio: 0.7.2 -> 0.8 2017-11-23 17:21:38 +01:00
adisbladis 879f23ea1b pythonPackages.gevent: 1.1.2 -> 1.2.2 2017-11-23 17:21:38 +01:00
Frederik Rietdijk 6a3b92626e python.pkgs.psutil: 4.3.0 -> 5.4.1 2017-11-23 17:06:19 +01:00
Frederik Rietdijk 543136e863 python.pkgs.psutil: move to separate expression 2017-11-23 17:06:17 +01:00
Frederik Rietdijk 35f5912db5 Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-23 16:38:39 +01:00
Frederik Rietdijk 6ad79678d4 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-23 16:38:31 +01:00
Piotr Bogdan 3f7ffa9f89 wp-cli: 1.4.0 -> 1.4.1 2017-11-23 15:28:23 +00:00
Frederik Rietdijk 24b7b3e49f python.pkgs.setuptools: 36.4.0/36.6.0 -> 36.7.1 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 80329e7123 python.pkgs.buildPythonPackage: some comments 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 7c3c2a0dca python.pkgs.pytest: add missing setuptools dependency 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 209ee2f20f python.pkgs.buildPythonPackage: do not pass attributes that stdenv.mkDerivation does not use 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 985f0ce15d python.pkgs.rivet: add bindings for rivet 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 42eece04e4 python.pkgs.buildPythonPackage: meta.maintainers: don't add chaoflow 2017-11-23 15:11:03 +01:00
Frederik Rietdijk 40851a4d26 Python: the pythonModule attribute
Python libraries or modules now have an attribute `pythonModule = interpreter;` to indicate
they provide Python modules for the specified `interpreter`.

The package set provides the following helper functions:

- hasPythonModule: Check whether a derivation provides a Python module.
- requiredPythonModules: Recurse into a list of Python modules, returning all Python modules that are required.
- makePythonPath: Create a PYTHONPATH from a list of Python modules.

Also included in this commit is:
- disabledIf: Helper function for disabling non-buildPythonPackage functions.
2017-11-23 15:11:02 +01:00
Jörg Thalheim a30fa6d9a2
Merge pull request #31959 from yrashk/gdbgui
gdbgui: init at 0.9.0.1
2017-11-23 13:41:13 +00:00