1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

114912 commits

Author SHA1 Message Date
Bernd Amend b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
Frederik Rietdijk 38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
Frederik Rietdijk 67651d80bc Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-06 13:54:10 +02:00
Michael Raskin 036bafe0b9 ocropus: 20150316 -> 20170811 2017-09-06 13:46:16 +02:00
Michael Raskin 6f740953e6 silgraphite: drop graphite1 (which had version 2.x) 2017-09-06 13:46:16 +02:00
Michael Raskin fff500fc00 vacuum: 1.2.4 -> 1.3.0.20160104 2017-09-06 13:46:16 +02:00
Michael Raskin f20ccd4b5e pythonPackages.wptserve: make python2-only (upstream uses relative import in the latest release) 2017-09-06 13:46:16 +02:00
Michael Raskin cca09d8067 pythonPackages.manifestparser: make python2-only 2017-09-06 13:46:16 +02:00
Michael Raskin ad44a76005 pythonPackages.browsermob-proxy: make python2-only 2017-09-06 13:46:16 +02:00
Peter Simons 89f5d52cf4 Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f25484, reversing
changes made to 7f8ff02437. These changes broke
the ghcWithPackages wrapper:

    nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
    /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
        (no packages)
2017-09-06 10:19:18 +02:00
Peter Simons f2a76b6c29 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
6bd6c397f5.
2017-09-06 10:19:12 +02:00
Peter Simons e1a67915f8 haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure 2017-09-06 10:17:46 +02:00
Peter Simons b2bff7e8ae LTS Haskell 9.3 2017-09-06 09:58:46 +02:00
Peter Hoeg fefdc00c52 arc-theme: Fix build with gnome 3.24 2017-09-06 14:55:30 +08:00
Cray Elliott f03964ff7c winetricks: 20170614 -> 20170823 2017-09-05 23:29:31 -07:00
Joachim F 9f110745b1 Merge pull request #28922 from xtruder/pkgs/spice-vdagent/systemd_support
spice-vdagent: add systemd support
2017-09-06 05:21:20 +00:00
Joachim F 035459081c Merge pull request #29033 from yesbox/sonarr_2.0.0.4949
sonarr: 2.0.0.4928 -> 2.0.0.4949
2017-09-06 05:15:51 +00:00
John Ericson f152a5d7bb mplayer: depsBuildBuild isn't (yet) a parameter, so don't use it
Thanks @dezgeg for catching my error.
2017-09-06 00:37:15 -04:00
John Ericson 28e4975bd1 zile: disable help2man for cross builds
@dezgeg caught my error--the issue isn't building help2man, but running
it on cross-compiled binaries.

This effectively reverts 0825f30fd2 as
far as behavior is concerned, but keeps the removal of `crossAttrs`.
2017-09-06 00:31:25 -04:00
Jörg Thalheim 8e37e744d2 Merge pull request #29036 from andir/update-rustup1.3.0
rustup: 1.2.0 -> 1.3.0
2017-09-06 00:23:31 +01:00
Cray Elliott 6df5f88aca nvidia-x11: 375.66 -> 384.69 2017-09-05 16:12:31 -07:00
Jörg Thalheim 7b397d1b56 Merge pull request #29038 from elitak/factorio-version
Factorio version
2017-09-06 00:07:18 +01:00
John Ericson 40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg
misc pkgs: Reorganize dependencies ahead of #26805
2017-09-05 18:10:32 -04:00
Franz Pletz 333eacaf8b Merge pull request #29027 from WilliButz/packageUpdates
grafana: 4.3.2 -> 4.4.3
2017-09-06 00:05:36 +02:00
Eric Litak 2164c01a53 factorio: 0.15.33 -> 0.15.34 2017-09-05 15:04:27 -07:00
Eric Litak 02d715d29b factorio: refactored the arch+version abstraction 2017-09-05 15:02:24 -07:00
Daiderd Jordan d0d905668c
haskell-hscolour: fix darwin build 2017-09-05 22:56:09 +02:00
Charles Strahan 3189b01647
go: init 1.9 (and set as default) 2017-09-05 16:44:13 -04:00
Andreas Rammhold 14c3ce919b
rustup: 1.2.0 -> 1.3.0 2017-09-05 22:27:30 +02:00
Daiderd Jordan 8706664ff6
afl: use clangStdenv
Fixes #28712
2017-09-05 22:00:44 +02:00
yesbox 5059db823a sonarr: 2.0.0.4928 -> 2.0.0.4949 2017-09-05 21:52:00 +02:00
Daiderd Jordan 0adb83e2a2 Merge pull request #28998 from LnL7/libstdcxx-hook
libstdc++: add setup-hook
2017-09-05 21:40:31 +02:00
Daiderd Jordan 907222098a
clang-stdenv: use libstdcxxHook when targeting linux 2017-09-05 21:37:06 +02:00
Samuel Leathers 402e6ac089
libfpx: fix build with gcc6 2017-09-05 21:29:10 +02:00
WilliButz 226a20117d
grafana: 4.3.2 -> 4.4.3 2017-09-05 21:12:17 +02:00
Franz Pletz 84ec7ef6c3
file: 5.31 -> 5.32 for CVE-2017-1000249 2017-09-05 20:22:01 +02:00
Franz Pletz fea02e30f1
ncurses: 6.0-20170729 -> 6.0-20170902
Fixes issues with xterm terminfo.
2017-09-05 20:14:15 +02:00
Franz Pletz bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
John Ericson 5b6d78194c Merge pull request #29028 from obsidiansystems/cross-cleanup
misc pkgs: Clean up cross
2017-09-05 13:59:50 -04:00
John Ericson 10b2bb8288 mplayer: Simplify cross, no crossAttrs or crossConfig 2017-09-05 13:45:34 -04:00
John Ericson 5de3b11960 links 2: Simplify cross, no crossAttrs or crossConfig 2017-09-05 13:25:35 -04:00
John Ericson 8babcd4d2b elinks: Simplify cross, no crossAttrs or crossConfig 2017-09-05 13:25:21 -04:00
John Ericson 0825f30fd2 zile: help2man is no longer likely to cause problems 2017-09-05 13:23:46 -04:00
Jörg Thalheim abdd0bbf4e gerrit: avoid copy of war file in build 2017-09-05 18:21:43 +01:00
Joachim Fasting 5113be54a4
tor-browser-bundle-bin: 7.0.4 -> 7.0.5 2017-09-05 19:20:02 +02:00
Jörg Thalheim bd794ccf23 Merge pull request #29024 from jammerful/gerrit
gerrit: init at 2.14.3
2017-09-05 18:14:00 +01:00
Jörg Thalheim 8144460e36 gerrit: fixed-output derivation to avoid rebuilds
see also https://github.com/NixOS/nixpkgs/issues/27754#issue-246545036
for motivation.
2017-09-05 18:11:09 +01:00
Franz Pletz 1bed4773f5
postgresql92: remove last references 2017-09-05 18:20:56 +02:00
pbogdan 94a4183bda nixos/fontconfig: fix substitutions option (#28895) 2017-09-05 16:20:42 +00:00