Commit Graph

13742 Commits

Author SHA1 Message Date
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
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 0ecb390981
colord: fix colord-sane path 2017-11-26 03:11:01 +01:00
Jan Tojnar d6d8dfd671
colord: wrap to use GSettings 2017-11-26 03:10:59 +01:00
Jan Tojnar fabc930ddd
colord: move the DBus configuration to /etc
NixOS generates /etc/dbus-1/system.conf including the configuration
of all the dbus derivations. Unfortunately, colord places the configuration
into $out/share instead of expected $out/etc.

This commit patches colord to use the expected path.

https://github.com/hughsie/colord/issues/61
2017-11-26 03:10:58 +01:00
Jan Tojnar 1c1d677149
gnome3: dependency tweaks 2017-11-26 03:10:49 +01:00
Frederik Rietdijk 0cd857bffd Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 11:38:13 +01:00
Frederik Rietdijk 88eea6947f
Merge pull request #31781 from robertodr/hdf5-fortran-2003
Update HDF5 and add option to compile Fortran2003 interface
2017-11-25 10:37:42 +00:00
Jörg Thalheim b0bf60a4e2
Merge pull request #32010 from pcarrier/pcarrier/minijail
minijail: init at android-8.0.0_r34
2017-11-25 10:09:09 +00:00
Frederik Rietdijk d087463b48 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 09:13:36 +01:00
Orivej Desh 45a85eaceb go-sct: disable on Darwin
It does not support Darwin.
2017-11-25 07:35:44 +00:00
Pierre Carrier cb05c04f4e minijail: init at android-8.0.0_r34 2017-11-25 00:27:00 -05:00
Jörg Thalheim 8b237dbd2f
Merge pull request #31988 from Baughn/povray
povray: Add X11/SDL preview support
2017-11-24 20:07:12 +00: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
Graham Christensen 3216947201
Merge pull request #31996 from kierdavis/ckb-next
ckb: update to ckb-next 0.2.8
2017-11-24 08:42:57 -05:00
Kier Davis 4017f0f752
pius: add myself as a maintainer 2017-11-24 11:30:17 +00:00
Kier Davis 1f62cfa6f5
pius: 2.0.11 -> 2.2.4 2017-11-24 11:29:59 +00:00
Kier Davis b354f88327
pius: move source from Sourceforge to Github
Development of pius has moved to Github.
2017-11-24 11:12:51 +00:00
Kier Davis 82b4224a3c
ckb: update to ckb-next 0.2.8
The original ckb is no longer maintained. ckb-next is an
active fork with a number of new patches and features.
2017-11-24 00:58:46 +00:00
Svein Ove Aas 7a8853005a povray: Add X11/SDL preview support 2017-11-23 19:58:20 +00:00
Peter Romfeld cc234675a9 fastlane: 2.63.0 -> 2.66.2 2017-11-24 00:25:21 +08: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 9544383744 system-config-printer: recurse into python dependencies
pythonPath is used to create the eventual wrappers. It does not recurse
into the Python dependencies, which means e.g. requests doesn't haven
its dependencies.
2017-11-23 15:11:02 +01:00
Samuel Leathers fdc2fe1e0c
Merge pull request #31911 from dotlambda/abcm2ps
abcm2ps: 8.13.16 -> 8.13.17
2017-11-22 21:41:06 -05: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
Tim Steinbach c61e6a37f0
Merge pull request #31938 from Ma27/init/docker-ls
docker-ls: init at v0.3.1
2017-11-22 17:47:58 +00:00
Maximilian Bosch 1e2722ae22
docker-ls: init at v0.3.1 2017-11-22 16:08:45 +01:00
Orivej Desh 1bae36bc41 openvpn-auth-ldap: rehash patches 2017-11-22 14:10:46 +00:00
Bas van Dijk bfade3206c nixopsUnstable: upgrade to HEAD and use a tarball from hydra 2017-11-22 09:42:41 +00:00
Jörg Thalheim 98d12e681c
Merge pull request #31909 from andir/clamav
clamav: apply patch for CVE-2017-6420
2017-11-22 08:20:03 +00:00
Joachim F 7cfe20dc77
Merge pull request #31920 from andir/yara
yara: 3.6.3 -> 3.7.0
2017-11-22 04:02:59 +00:00
Andreas Rammhold e7a65e5312
yara: 3.6.3 -> 3.7.0 2017-11-22 00:45:38 +01: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
Roberto Di Remigio eb43cc569a
hdf5: 1.8.18 -> 1.10.1 2017-11-21 22:08:07 +01:00
Roberto Di Remigio 98a748485e
hdf5_1_8: add fortran2003 option 2017-11-21 22:08:06 +01:00
Roberto Di Remigio 443faefdfb
hdf5_1_8: 1.8.18 -> 1.8.19 2017-11-21 22:08:06 +01:00
Roberto Di Remigio e4ac6f6ab2
hdf5_1_8: init at 1.8.18 2017-11-21 22:08:06 +01:00
Jörg Thalheim cef1abbd88
Merge pull request #31898 from andir/wimlib
wimlib: init at 1.12.0
2017-11-21 21:06:23 +00:00
Robert Schütz 8d2d26db4d abcm2ps: 8.13.16 -> 8.13.17 2017-11-21 21:54:29 +01:00
Joerg Thalheim 32ce470720 wimlib: nitpicks 2017-11-21 20:40:52 +00:00
Andreas Rammhold f01acd4cd5
clamav: apply patch for CVE-2017-6420
Details at [1].

[1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6420
2017-11-21 21:39:29 +01:00
Andreas Rammhold 40180335a9
wimlib: init at 1.12.0 2017-11-21 20:43:12 +01: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
Joerg Thalheim b815ae1a0b LanguageTool: 3.7 -> 3.9 2017-11-21 12:04:07 +00:00
Orivej Desh 0b9cd7ad0f pdf2djvu: ignore windres on linux to fix build
https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345899910
2017-11-21 03:43:18 +00:00
Daiderd Jordan d5b02278c6
Merge pull request #31814 from matthewbauer/screenfetch-darwin
screenfetch: fix darwin execution
2017-11-21 00:59:24 +01: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
Niklas Hambüchen 7be449a97d glusterfs: 3.12.2 -> 3.12.3 2017-11-20 18:57:55 +00:00
Niklas Hambüchen afe5179e22 glusterfs: 3.12.1 -> 3.12.2 2017-11-20 18:57:55 +00:00