3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

98312 commits

Author SHA1 Message Date
Nikolay Amiantov 40a9c37ff3 node-env: use upstream version 2017-01-04 02:52:38 +03:00
Graham Christensen 6b504f8b52 Merge pull request #21626 from NeQuissimus/gradle_3_3
gradle: 3.2.1 -> 3.3
2017-01-03 18:45:42 -05:00
Daiderd Jordan 708bdd229a Merge pull request #21600 from mdaiter/wxGTKErlangLink
erlang: explicitly link appropriate wxGTK versions for R18/R19
2017-01-04 00:44:19 +01:00
Daiderd Jordan d8fcf3c1cf Merge pull request #21597 from volth/xfce4-windowck-plugin-0.4.4
xfce4-windowck-plugin: init at 0.4.4
2017-01-04 00:27:22 +01:00
Graham Christensen 85dbc754a1 Merge pull request #21621 from volth/fix-synaptics-symlink
synaptics: fix broken symlink
2017-01-03 18:13:40 -05:00
Daiderd Jordan 6158604d8a Merge pull request #21603 from abuibrahim/master
ofp: init at 2.0.0
2017-01-04 00:12:58 +01:00
Daiderd Jordan 353952938f Merge pull request #21622 from chris-martin/pr/useSandbox-doc
Add some more details about the nix.useSandbox option
2017-01-04 00:10:49 +01:00
Daiderd Jordan 3daa019125 Merge pull request #21551 from zauberpony/vultr-init
vultr: init at 1.12.0
2017-01-04 00:08:04 +01:00
Graham Christensen 3080fcf616 Merge pull request #21602 from peterhoeg/u/st_1418
syncthing: 0.14.17 -> 0.14.18
2017-01-03 18:06:40 -05:00
Tim Steinbach 02efac3f9f
gradle: 3.2.1 -> 3.3 2017-01-03 17:38:01 -05:00
Domen Kožar 17b7eb22c3 haskellPackages.wai-app-file-cgi: fix #21498 2017-01-03 23:28:58 +01:00
Tristan Helmich f808502aba smokeping: cleanup (option ordering) 2017-01-03 23:10:59 +01:00
Tristan Helmich b5703eaa80 smokeping: Allow full override of imgurl + cgiurl 2017-01-03 23:10:54 +01:00
Domen Kožar 663048f378 Revert "haskell: workaround for bug with dynamic libraries on darwin"
This reverts commit 19e2e7290a.

See the correct fix in aa64994b48a29ea8d12323942f1743fa4133527a

General purpose solution will be once we implement
https://github.com/NixOS/nixpkgs/issues/21624
2017-01-03 23:10:24 +01:00
Domen Kožar af2cfc076f haskellPackages.z3: fix #16357 2017-01-03 23:10:24 +01:00
Domen Kožar 4bba954e13 rocksdb: properly fix #21215 2017-01-03 23:10:24 +01:00
Domen Kožar 4ce88d8674 rocksdb: build without debug 2017-01-03 23:10:24 +01:00
Domen Kožar 8b6b0aea72 Revert "rocksdb-haskell: just compile rocksdb statically to fix #21215"
This reverts commit 5e5df0fea2.
2017-01-03 23:10:24 +01:00
Bjørn Forsman 26dc6dab4c avidemux: 2.6.15 -> 2.6.16 2017-01-03 20:27:25 +01:00
Chris Martin 6a7664e6cd Add some more details about useSandbox 2017-01-03 14:24:49 -05:00
volth 428daee5bc fix broken link to synaptics config 2017-01-03 19:23:24 +00:00
Ruslan Babayev f3e2feb057 ofp: init at 2.0.0 2017-01-03 10:28:46 -08:00
Jörg Thalheim d05656a9ca rustNightlyBin: fix build hash 2017-01-03 18:21:19 +00:00
Tim Steinbach 92d0a977d9 Merge pull request #21614 from NeQuissimus/busybox_1_26_1
busybox: 1.25.1 -> 1.26.1
2017-01-03 13:09:35 -05:00
Vladimír Čunát 1fe136ea8a
Make all meta.maintainers attributes lists
(cherry picked from commit b714f55239)
The two new changes were really missing on master.
2017-01-03 18:28:20 +01:00
Michael Raskin 30f509437c maxima: use previous versions of ECL and SBCL; the tests fail with the latest versions 2017-01-03 18:06:48 +01:00
Michael Raskin efd2b279f3 sbcl_1_3_12: init at 1.3.12; reinstating the previous version for Maxima 2017-01-03 18:06:47 +01:00
Michael Raskin 95f3473e18 ecl_16_1_2: init at 16.1.2; reinstating for Maxima 2017-01-03 18:06:47 +01:00
Michael Raskin 7c29295deb gcl_2_6_13_pre: init at 2.6.13pre50. GCL hasn't had releases for a long time, but there are relatively regular prereleases 2017-01-03 18:06:46 +01:00
Daiderd Jordan 0778a1ce3b Merge pull request #21596 from LnL7/darwin-stdenv
stdenv: bootstrap cmake and python on darwin
2017-01-03 18:06:00 +01:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Eelco Dolstra d496f23df0
amazon-image.nix: Remove redundant log message
(cherry picked from commit c4b5ed5db74cde94b19d519a8d875e3f7df48a76)
2017-01-03 17:32:47 +01:00
Eelco Dolstra b297af42d2
Fix using ephemeral disks for /tmp etc. in EC2 instances
This code in amazon-image.nix:

  if mountFS "$device" "$mp" "" auto; then
    if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
  fi

relies on mountFS to return a zero exit status if mounting
succeeds. But the lustrateRoot check in mountFS was causing a non-zero
exit status. As a result /disk0 would be mounted, but not used for
/tmp.

(cherry picked from commit d082ed8c35dec48aee2afd1303b3c8b2a1b242b0)
2017-01-03 17:32:42 +01:00
Pascal Wittmann c4175a071b Merge pull request #21617 from mguentner/subsurface_beta
subsurface 4.5.6 -> 4.5.97
2017-01-03 17:30:38 +01:00
Jörg Thalheim fd152db8f7 rustNightlyBin: 2016-12-05 -> 2016-12-29 (#21618)
- add cargo (hence the renaming)
- also allow to built nix packages
2017-01-03 16:50:56 +01:00
Eelco Dolstra 82b0ae1223 Merge pull request #21612 from NeQuissimus/curl_7_52_1
curl: 7.51.0 -> 7.52.1
2017-01-03 16:11:35 +01:00
Maximilian Güntner 67d73657a9
Revert "libgit2: reinit at 0.23.2"
This reverts commit 2e15a8f2dd.
libgit2 v0.23.2 is no longer necessary due to
edbe73dc13e6090269f0d8b2bb759c7957a83ec1

Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Maximilian Güntner b00516ca31
subsurface: 4.5.6 -> 4.5.97 (beta 2)
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Maximilian Güntner 7e87be4055
libdivecomputer: add subsurface version
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 15:43:51 +01:00
Thomas Tuegel 0723aa8108 Merge pull request #21466 from abbradar/kde-wrapper
Flatten nested kdeWrappers
2017-01-03 08:21:39 -06:00
Gabriel Ebner c6ec873aec Merge pull request #21554 from gebner/emscripten-wrapped
emscriptenfastcomp: build using cmake and use cc-wrapper
2017-01-03 09:15:32 -05:00
Tim Steinbach 125fa1520d
curl: 7.51.1 -> 7.52.1 2017-01-03 08:42:59 -05:00
Tim Steinbach 9bd93ac6e0
busybox: 1.25.1 -> 1.26.1 2017-01-03 08:40:32 -05:00
Peter Simons 494d695b97 Merge pull request #21393 from mpickering/master
Small improvements to development GHC derivations
2017-01-03 14:40:18 +01:00
Stefan Goetz 85ff5a2583 youtube-dl: 2016.12.22 -> 2017.01.02 (#21607) 2017-01-03 14:13:35 +01:00
Eelco Dolstra b4f401104d
Fix big-parallel usage
requiredSystemFeatures is not a meta attribute but a derivation
attribute. So "big-parallel" was being ignored on e.g. chromium,
causing it to be built (and timing out) on slow machines.

http://hydra.nixos.org/build/45819778#tabs-buildsteps
2017-01-03 13:55:26 +01:00
Adam Stephens 586ceaf718 terraform: 0.8.1 -> 0.8.2 (#21601) 2017-01-03 12:29:46 +00:00
Tuomas Tynkkynen 2a4c8313e4 linux_testing: 4.10-rc1 -> 4.10-rc2 2017-01-03 13:51:23 +02:00
Jörg Thalheim 1d72e81d6f Merge pull request #21608 from volth/miredo-fix-kill-path
miredo: fix path to "kill"
2017-01-03 11:30:56 +01:00
Eelco Dolstra 0108c31e22
nix: 1.11.4 -> 1.11.5 2017-01-03 11:25:38 +01:00