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

29857 commits

Author SHA1 Message Date
Joachim Fasting 220836d066
gd: apply patch for CVE-2016-3074 from upstream
Source:
2bb97f407c.patch

The original patch contains binary data, however, which is not supported
by `patch`; we could use `git apply` here, of course, but it was simpler
to just copy-paste only the fix into a separate file and include it in
the repo.
2016-05-14 07:15:41 +02:00
Joachim Fasting f8bdd7969d
gd: 2.0.35 -> 2.1.1
Upstream claims 2.1 is fully API compatible with 2.0

https://libgd.github.io/release-2.1.0.html
https://libgd.github.io/release-2.1.1.html

Also includes meta updates, adds pkg-config to the build environment,
for proper detection of dependencies, and adds optional support for tiff
and xpm image formats.
2016-05-14 07:15:41 +02:00
Joachim Fasting 3f0518ac4d Merge pull request #15378 from aneeshusa/add-lib-output-for-ccacheStdenv
ccacheStdenv: inherit lib output from wrapped gcc
2016-05-14 06:25:34 +02:00
Nikolay Amiantov c6a61092e7 pythonPackages.sip: let python.buildEnv detect it 2016-05-14 04:29:22 +03:00
Nikolay Amiantov 38ef2df4a6 pythonPackages.pyqt{,5}: let python.buildEnv detect it 2016-05-14 04:22:50 +03:00
Nikolay Amiantov 4ed271893f pythonPackages.pygobject{,3}: let python.buildEnv detect it 2016-05-14 04:04:41 +03:00
Nikolay Amiantov 4cb218b76a xgboost: fix license
Looks like `nix-env -qaP --drv-path` is not enough and one need to
either add `--json` too to catch problems like this... or just use
`nox-review wip`.
2016-05-14 02:38:12 +03:00
Nikolay Amiantov c403235585 xgboost: init at 2016-05-14 2016-05-14 02:16:13 +03:00
Joachim Fasting aab9a5f0d1 Merge pull request #15351 from groxxda/bump/libinput
libinput: 1.2.3 -> 1.3.0
2016-05-13 20:36:33 +02:00
Benjamin Staffin f17fc4ed1c Merge pull request #15426 from zimbatm/packer-0.10.1
packer: 0.8.6 -> 0.10.1
2016-05-13 12:18:05 -04:00
vbgl 2d72723726 ocaml-batteries: 2.4.0 -> 2.5.2 (#15424) 2016-05-13 18:08:17 +02:00
Franz Pletz 4a3a92d5c8 jenkins: 1.653 -> 2.3 2016-05-13 17:45:39 +02:00
Franz Pletz 4d750ae2c7 php: 7.0.5 -> 7.0.6 2016-05-13 17:27:59 +02:00
Franz Pletz 9e56f3a9b5 oraclejdk8: 8u91 -> 8u92 2016-05-13 17:27:00 +02:00
Franz Pletz d510563837 oraclejdk8: jmc is only available in jdk, not in jre 2016-05-13 17:27:00 +02:00
zimbatm 3aa2992bc1 packer: 0.8.6 -> 0.10.1 2016-05-13 09:39:08 +01:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Nikolay Amiantov f67b8f8e64 Merge pull request #15422 from rardiol/scorched3d
scorched3d update and SDL1.2 opengl fix
2016-05-13 02:00:16 +03:00
Ricardo Ardissone 79914075f4 SDL: Revert "SDL: use mesa_noglu instead of mesa"
This reverts commit a9a94df4e6.
2016-05-12 18:40:33 -03:00
Jude Taylor 582fef1299 fix pip URL 2016-05-12 13:55:40 -07:00
Pascal Wittmann 8ce8226655 libfilezilla: 0.5.0 -> 0.5.1 2016-05-12 20:59:15 +02:00
Pascal Wittmann be482b2314 groovy: 2.4.5 -> 2.4.6 2016-05-12 20:57:46 +02:00
Pascal Wittmann cfd899c00f checkstyle: 6.17 -> 6.18 2016-05-12 20:41:30 +02:00
Nikolay Amiantov 3098547ebc haskell.packages.ghc801: 8.0.0.20160421 -> 8.0.1 2016-05-12 19:47:51 +03:00
Thomas Tuegel 1ac8374e95 Merge branch 'ats2' 2016-05-12 10:23:12 -05:00
Thomas Tuegel 8c525431c8 postiats-utilities: init at 2.0.1 2016-05-12 07:37:53 -05:00
Frederik Rietdijk 5d68baa8db Python bootstrapped-pip: 8.1.1 -> 8.1.2 2016-05-12 14:27:51 +02:00
Joachim Fasting f236168662 Merge pull request #15401 from acowley/libass-darwin
libass: darwin compatibility
2016-05-12 10:08:22 +02:00
Carles Pagès d077506443 assimp: 3.1.1 -> 3.2 2016-05-12 09:13:07 +02:00
Anthony Cowley 6360ad48af libass: darwin compatibility 2016-05-12 01:50:13 -04:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Bjørn Forsman 300e495101 sigrok: update whole suite to latest (2016-01)
Release announcement, 2016-01-30:
https://www.sigrok.org/blog/major-sigrok-releases-libsigrok-libsigrokdecode-sigrok-cli-pulseview

I first tried updating the projects in separate commits. But later I
found cyclic dependencies, that would break git bisect, so I ended up
squashing the commits:

* libsigrok: 0.3.0 -> 0.4.0
  Enable building libsigrokcxx.so, the C++ bindings for libsigrok, by
  adding doxygen, glibmm and python as build deps. This is needed for
  Pulseview >= 0.3.0. Also update the firmware (sigrok-firmware-fx2lafw)
  while at it.

* libsigrokdecode: 0.3.0 -> 0.4.0

* sigrok-cli: 0.5.0 -> 0.6.0

* pulseview: 0.2.0 -> 0.3.0
  New dependency: glibmm (due to libsigrokcxx.pc from libsigrok).

Note that collectd is incompatible with the new libsigrok release, so
I let it use the old one (0.3.0).
2016-05-11 22:23:29 +02:00
Bjørn Forsman f768098e3e libserialport: 0.1.0 -> 0.1.1 2016-05-11 22:23:29 +02:00
Bjørn Forsman 2d7e4de12e Revert "arduino: 1.0.6 -> 1.6.6"
This reverts commit 6ff886e539 because it
doesn't work when chroot builds are enabled (nix.useChroot = true):

  $ nix-build -A arduino
  these derivations will be built:
    /nix/store/xjv1j3mww4jx1vccfc0p1inlcrlgx2if-arduino-1.6.6.drv
  building path(s) ‘/nix/store/58sdiphd4pm3811gir0b8j718pgq8zvk-arduino-1.6.6’
  ...
  untar-unzip-download:
        [get] Getting: http://downloads.arduino.cc/reference-1.6.6-3.zip
        [get] To: /tmp/nix-build-arduino-1.6.6.drv-0/Arduino-1.6.6-src/build/shared/reference-1.6.6-3.zip
        [get] Error getting http://downloads.arduino.cc/reference-1.6.6-3.zip to /tmp/nix-build-arduino-1.6.6.drv-0/Arduino-1.6.6-src/build/shared/reference-1.6.6-3.zip

  untar-unzip-checksum:
       [echo] Testing checksum of "shared/reference-1.6.6-3.zip"
   [checksum] Could not find file /tmp/nix-build-arduino-1.6.6.drv-0/Arduino-1.6.6-src/build/shared/reference-1.6.6-3.zip to generate checksum for.

  BUILD FAILED

Reasoning: without a revert, the build farm cannot produce binaries and
users that build from source, without chroot, cannot trust that they get
a working result (non-deterministic build, depending on how pure the
arduino builder is).
2016-05-11 21:11:28 +02:00
Thomas Tuegel d22df66c54 qt56: remove fixQtModuleCMakeConfig 2016-05-11 10:19:28 -05:00
Thomas Tuegel 3f74ac1f34 ats2: add ttuegel to maintainers 2016-05-11 10:02:09 -05:00
Thomas Tuegel d91e736de5 ats2: 0.2.4 -> 0.2.6 2016-05-11 10:01:59 -05:00
Nikolay Amiantov 700e2952be Merge pull request #15012 from abbradar/unixodbc
UnixODBC updates
2016-05-11 17:42:33 +03:00
Joachim Fasting a0e8d542c7 Merge pull request #15377 from womfoo/sniproxy
sniproxy: init at 0.4.0 with dependency udns: init at 0.4
2016-05-11 15:14:33 +02:00
Stewart Mackenzie 6b9c67333f elm: 0.16.0 -> 0.17.0 (#15383) 2016-05-11 12:30:09 +01:00
Kranium Gikos Mendoza f7e3f177d1 udns: init at 0.4 2016-05-11 13:27:28 +08:00
Aneesh Agrawal f4a2ea2203 ccacheStdenv: inherit lib output from wrapped gcc 2016-05-11 00:45:41 -04:00
Joachim Fasting 23f1659ab2 Merge pull request #15364 from bendlas/update-pixie
pixie: 1333 -> 1352
2016-05-11 06:42:33 +02:00
Thomas Tuegel 05bbe4fa55 phonon: remove qtquick1 input 2016-05-10 20:09:15 -05:00
Ryan Trinkle e3417b0f71 Merge pull request #15375 from ryantrinkle/ghc8-ghcjs-prim
ghc8 | config: ghcjs-prim: init at 0.1.0.0
2016-05-10 20:39:04 -04:00
Ryan Trinkle 2bae6b6737 ghc8 | config: ghcjs-prim: init at 0.1.0.0 2016-05-10 20:01:09 -04:00
Tobias Geerinckx-Rice 47d2dd4f31
libpsl: list 2016-04-16 -> 2016-05-10 2016-05-10 23:45:23 +02:00
Tobias Geerinckx-Rice dcf3fe2b78
dev86: 0.16.19 -> 0.16.21
Drop the ‘awful hackery’ that no longer seems needed (I can reproduce
the failure with .19, not with .21).
2016-05-10 23:30:37 +02:00
Tomasz Czyż 92cb6add9f usb-modeswitch-data: init at 20160112 2016-05-10 21:59:37 +01:00
Tomasz Czyż 79c06a0ad9 usb_modeswitch: 2.2.1 -> 2.3.0 2016-05-10 21:58:31 +01:00