3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

29840 commits

Author SHA1 Message Date
Franz Pletz d510563837 oraclejdk8: jmc is only available in jdk, not in jre 2016-05-13 17:27:00 +02: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
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
Herwig Hochleitner 2a4af7ef72 pixie: 1333 -> 1352 2016-05-10 19:56:55 +02:00
Michael Alan Dorman d2387e3c4a haskellPackages.hjsonschema: remove hjsonpointer override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman deba002b3c haskellPackages.hindent: remove testing override 2016-05-10 12:28:36 +02:00
Michael Alan Dorman d8c24dae8f haskellPackages.pipes-transduce: Remove foldl override 2016-05-10 12:28:36 +02:00
Peter Simons d19e8ea429 configuration-ghc-7.10.x.nix: enable builds for cabal-install 1.24.x 2016-05-10 12:28:36 +02:00
Peter Simons c23fd4fbc9 configuration-ghc-7.10.x.nix: remove obsolete override for linear 2016-05-10 12:28:36 +02:00
Peter Simons 2f9a2e6808 configuration-ghc-7.10.x.nix: switch jailbreak-cabal to Cabal 1.24.x 2016-05-10 12:28:35 +02:00
Peter Simons 85aa0ea16b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160406-11-g659087e using the following inputs:

  - Hackage: 62d7be84b9
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 186e5fa04d
2016-05-10 12:28:30 +02:00
Frederik Rietdijk 1d487057e2 Merge pull request #14900 from abbradar/python3-wrap
wrapPython: drop python suffixes
2016-05-10 12:22:48 +02:00
Michael Raskin 99bab146a5 julia: 0.4.2 -> 0.4.5 2016-05-10 11:29:38 +02:00
Michael Raskin 516f2ec309 Merge pull request #15348 from tohl/master
sbcl: 1.3.4 -> 1.3.5
2016-05-10 07:51:09 +00:00
Joachim Fasting 81fad06167 Merge pull request #15265 from holidaycheck/node-6.1.0
nodejs: 6.0.0 -> 6.1.0
2016-05-10 09:11:44 +02:00
Joachim Fasting f1184b8910 Merge pull request #15346 from ktosiek/dfeet-bump
d-feet: 0.3.10 -> 0.3.11
2016-05-10 09:10:59 +02:00
Tomas Hlavaty 111110daee sbcl: 1.3.4 -> 1.3.5 2016-05-10 09:00:23 +02:00
Tomasz Kontusz 0ac224345c d-feet: 0.3.10 -> 0.3.11 2016-05-10 06:00:35 +02:00
Tobias Geerinckx-Rice ad0a9f5f52
autogen: fix borked source URL and hash 2016-05-10 01:59:14 +02:00