Commit Graph

23531 Commits

Author SHA1 Message Date
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
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
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
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
Frederik Rietdijk
7a13e5a7df Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-24 19:58:07 +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
adisbladis
d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +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
Frederik Rietdijk
985f0ce15d python.pkgs.rivet: add bindings for rivet 2017-11-23 15:11:03 +01:00
Bjørn Forsman
1e5bdbb273
Merge pull request #27344 from lukeadams/gnuradio-update
Gnuradio: Enable Darwin Support
2017-11-23 08:23:07 +01:00
Orivej Desh
a7e1bfe792
Merge pull request #31957 from jtojnar/libxml-2.9.7
libxml2: 2.9.5 → 2.9.7
2017-11-23 04:40:51 +00:00
Jan Tojnar
98ff9fca29
libxml2: 2.9.5 → 2.9.7 2017-11-23 05:28:39 +01:00
Samuel Leathers
057e20a416
Merge pull request #31947 from jtojnar/libinput-1.9.2
libinput: 1.9.1 → 1.9.2
2017-11-22 22:09:19 -05:00
Samuel Leathers
b4c63c3648
Merge pull request #31921 from corngood/rdesktop-krb
rdesktop: enable credssp
2017-11-22 22:04:49 -05:00
Samuel Leathers
06251bec3c
Merge pull request #31949 from vbgl/gnumeric-1.12.36
gnumeric: 1.12.35 -> 1.12.36; goffice: 0.10.35 -> 0.10.36
2017-11-22 21:25:31 -05:00
Orivej Desh
eb23772c10 double-conversion: rename attr from double_conversion 2017-11-22 23:39:03 +00:00
Luke Adams
de51e4a35b qwt6_qt4: enableParallelBuilding 2017-11-22 16:40:49 -06:00
Luke Adams
97c5cf0bf2 qwt6_qt4: preFixup: Repair relative reference in darwin framework output 2017-11-22 16:40:49 -06:00
Jan Tojnar
52c6c64f5c
libinput: 1.9.1 → 1.9.2
https://lists.freedesktop.org/archives/wayland-devel/2017-November/035817.html
2017-11-22 22:17:52 +01:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
Vincent Laporte
1f5c2fe90a
gnumeric: 1.12.35 -> 1.12.36
goffice: 0.10.35 -> 0.10.36
2017-11-22 18:52:31 +00:00
David McFarland
4434843d9c libgssglue: init at 0.4 2017-11-22 12:33:32 -04:00
Luke Adams
f90ddc99f6 qwt6_qt4: Fix darwin build by adding AGL input 2017-11-22 02:10:51 -06:00
Luke Adams
c3cfa106af qwt6_qt4: 6.1.2 -> 6.1.3 2017-11-22 02:10:51 -06:00
Orivej Desh
816843333d
Merge pull request #30946 from LumiGuide/opencv-3.3.1
opencv: 3.3.0 -> 3.3.1
2017-11-22 07:04:31 +00:00
Orivej Desh
4d50d79bc8 atlas: disable parallel building 2017-11-22 06:49:21 +00:00
Orivej Desh
b8e1e7191e Merge branch 'master' into staging
* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...
2017-11-21 22:48:36 +00:00
Orivej Desh
71a2a5ae40 qt4: enable parallel building
Please let me know if it fails to build in parallel so we could fix it, because
overwise it is a bottleneck of mass rebuilds.
2017-11-21 19:30:18 +00:00
Orivej Desh
d5e3935a6a atlas: enable parallel building 2017-11-21 19:29:10 +00:00
Orivej Desh
5421d2908f boehm-gc: enable parallel building 2017-11-21 17:58:48 +00:00
John Ericson
da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Vladimír Čunát
3772338be5
SDL2: disable parallel make
Example failure: https://hydra.nixos.org/build/64494600
It could be fixed more properly, but for me it builds under 80 secs anyway.
2017-11-21 12:55:47 +01:00
Daniel Peebles
81cc9bb41d
Merge pull request #31701 from matthewbauer/wesnoth-mac
Wesnoth MacOS
2017-11-20 22:42:59 -05:00
Orivej Desh
3f7751ecd4 flite: 1.9.0 -> 2.0.0, fix build with Nix 1.12
It is failing with:

     RPATH of binary /nix/store/...-flite-.../bin/flite contains a forbidden reference to /build

because of the rpath entry `../build/x86_64-linux-gnu/lib`.
2017-11-21 01:14:34 +00:00
Renaud
1d6f3ea265
Merge pull request #31573 from c0bw3b/pkg/pkcs11
opencryptoki, pkcs11-helper, simple-tpm-pk11
2017-11-20 22:40:58 +01:00
Joerg Thalheim
2ac6343d56 wayland-protocols: 1.10 -> 1.11 2017-11-20 17:20:18 +00:00
Joerg Thalheim
c30d535c7b wayland: 1.12.0 -> 1.14.0 2017-11-20 17:20:17 +00:00
Orivej Desh
ac387e3918 libstroke: replace dead links 2017-11-20 13:07:40 +00:00
Orivej Desh
54c281fa39 bullet283: delete old version 2017-11-20 10:55:47 +00:00