Commit Graph

26596 Commits

Author SHA1 Message Date
Frederik Rietdijk
3209775495 Merge master into staging 2018-07-22 11:14:41 +02:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk
6467cd4336
Merge pull request #43921 from r-ryantm/auto-update/opencollada
opencollada: 1.6.62 -> 1.6.63
2018-07-22 08:58:12 +02:00
Frederik Rietdijk
013e96de0a
Merge pull request #43948 from r-ryantm/auto-update/capstone
capstone: 3.0.4 -> 3.0.5
2018-07-22 08:21:18 +02:00
R. RyanTM
d0ad9db017 capstone: 3.0.4 -> 3.0.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/capstone/versions.
2018-07-21 20:12:45 -07:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Jan Tojnar
710d4e76dd
Merge pull request #43868 from jtojnar/drop-geoclue1
Drop geoclue1 & geoclue2: 2.4.8 → 2.4.10
2018-07-22 00:41:45 +02:00
Matthew Bauer
dc9018dfa2
libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
2018-07-21 17:36:22 -04:00
Matthew Bauer
916f096911
Merge pull request #43890 from matthewbauer/mingw-fixes
Mingw fixes
2018-07-21 17:04:20 -04:00
Matthew Bauer
522b61a069 openssl: work with mingw32 2018-07-21 17:00:05 -04:00
Matthew Bauer
3530c39b97 ncurses: add windows configure flags
these two flags are needed for windows support to work

- sp-funcs
- term-driver
2018-07-21 17:00:05 -04:00
R. RyanTM
7f6ebfe84d opencollada: 1.6.62 -> 1.6.63
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opencollada/versions.
2018-07-21 13:32:42 -07:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Bas van Dijk
1c48e89eb1 libtensorflow: init at 1.8.0
Required for haskell.packages.ghc822.tensorflow
2018-07-21 16:22:13 +02:00
Matthew Bauer
ef087554d0 libxslt: runs on all platforms
Mingw/Windows support works out of the box.
2018-07-21 10:10:47 -04:00
Matthew Bauer
92daacc9b0 libxml2: support all platforms
Mingw/Windows support works out of the box.
2018-07-21 10:10:47 -04:00
Frederik Rietdijk
251a0a9a86
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
Frederik Rietdijk
7db4c3617f
Merge pull request #43809 from Ma27/fix-python-xgboost
pythonPackages.xgboost: fix build
2018-07-21 11:05:44 +02:00
Frederik Rietdijk
bae4a82a11
Merge pull request #43753 from r-ryantm/auto-update/libsvm
libsvm: 3.22 -> 3.23
2018-07-21 11:03:13 +02:00
Frederik Rietdijk
312074260a
Merge pull request #43668 from r-ryantm/auto-update/zimg
zimg: 2.7.4 -> 2.7.5
2018-07-21 11:00:56 +02:00
Frederik Rietdijk
b8b6527a5f
Merge pull request #43784 from r-ryantm/auto-update/commons-compress
commonsCompress: 1.16.1 -> 1.17
2018-07-21 10:54:34 +02:00
Frederik Rietdijk
e4c28a169c
Merge pull request #43746 from r-ryantm/auto-update/opensubdiv
opensubdiv: 3.3.1 -> 3.3.2
2018-07-21 10:49:16 +02:00
Mario Rodas
ce408e8e75 boost167: Add lockfree next_prior patch 2018-07-21 07:56:02 +00:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Jan Tojnar
a6dab86ada
geoclue2: 2.4.8 → 2.4.10 2018-07-21 03:29:57 +02:00
Jan Tojnar
919a507cb2
geoclue2: move to default.nix 2018-07-21 02:30:10 +02:00
Jan Tojnar
75162b1045
geoclue: drop 2018-07-21 02:29:02 +02:00
Pascal Wittmann
a83b6f9cb3
frog: adhere to version schema convention
see issue #43717
2018-07-20 23:04:39 +02:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Silvan Mosberger
b5b23b39be
libsass: Fix CVE-2018-11693
See https://github.com/sass/libsass/pull/2676

For https://github.com/NixOS/nixpkgs/issues/43846
2018-07-20 17:46:45 +02:00
Graham Christensen
7fdba7c74e
Merge pull request #43834 from ryantm/https2
treewide: http -> https
2018-07-19 21:31:36 -04:00
Ryan Mulligan
df8062c45b treewide: http -> https 2018-07-19 18:12:04 -07:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer
0467e8d1f6 libuv: fix apple patch url
The old url was subject to change on pushing to the PR. It now
references the correct commit.
2018-07-19 10:12:58 -04:00
Matthew Bauer
dc24ab2776 gtkd: fixup from treewide commit
This was mistakenly replaced when it was already avoiding the alias.

Thanks @jtojnar
2018-07-19 09:57:29 -04:00
Maximilian Bosch
b9e7469c44
xgboost: 0.7 -> 0.72 2018-07-19 13:27:09 +02:00
Matthew Bauer
4ed7a4b993 treewide: preserve hashes from 76999cc40e
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
2018-07-19 00:09:01 -04:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Will Dietz
55aeb86902
Merge pull request #43760 from dtzWill/fix/mesa-18.1.4-includes-and-such-musl
mesa: more include fixes
2018-07-18 22:13:09 -05:00
R. RyanTM
d398020512 commonsCompress: 1.16.1 -> 1.17
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-compress/versions.
2018-07-18 16:41:39 -07:00
Will Dietz
488d42b0d2 npth: 1.5 -> 1.6
minor bump
2018-07-18 16:44:24 -05:00
volth
0f710bc8f6 libxklavier: 5.3 -> 5.4 (#43622) 2018-07-18 23:14:10 +02:00
R. RyanTM
a74cf6a851 podofo: 0.9.5 -> 0.9.6 (#43744)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/podofo/versions.
2018-07-18 22:39:53 +02:00
worldofpeace
3ea1e5079a elementary-cmake-modules: add version (#43732) 2018-07-18 22:26:13 +02:00
Will Dietz
06de6dc71b mesa: more include fixes
mostly from void-linux (thanks!)
2018-07-18 14:34:51 -05:00
R. RyanTM
8a1f77fe2d libsvm: 3.22 -> 3.23
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsvm/versions.
2018-07-18 11:28:23 -07:00
R. RyanTM
d59c3849a4 opensubdiv: 3.3.1 -> 3.3.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opensubdiv/versions.
2018-07-18 09:24:09 -07:00