Frederik Rietdijk
acfec163b1
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-07 12:15:17 +02:00
Joachim F
d6123d3b92
Merge pull request #30136 from bachp/gitlab-runner-10.0.2
...
gitlab-runner: 10.0.0 -> 10.0.2
2017-10-07 08:23:16 +00:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
...
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Orivej Desh
005210dfb3
Merge pull request #30169 from sigma/pr/bazel-0.6.1
...
bazel: 0.6.0 -> 0.6.1
2017-10-06 22:06:40 +00:00
Will Dietz
7637cb884c
bloaty: 2016-12-28 -> 2017-10-05
...
* use fetchFromGitHub now that it supports submodules
* change version style to dashes per guidelines
(https://nixos.org/nixpkgs/manual/#sec-package-naming )
* cmake
* prefer substituteInPlace
* run tests
2017-10-06 15:47:56 -05:00
Yann Hodique
3e37e20fa5
bazel: 0.6.0 -> 0.6.1
2017-10-06 08:33:57 -07:00
Orivej Desh
ebd14ee6f5
Merge pull request #30094 from zzamboni/vagrant-fix-darwin
...
vagrant: fix Ruby and libffi libraries on Darwin
2017-10-06 10:12:05 +00:00
Orivej Desh
82af1cbf2c
Merge pull request #30108 from carlsverre/dep-init
...
dep: init at 0.3.1
2017-10-06 06:42:33 +00:00
Carl Sverre
4a3ed5d531
dep: init at 0.3.1
2017-10-05 17:40:19 -07:00
Pascal Bach
4bb1d9f526
gitlab-runner: 10.0.0 -> 10.0.2
2017-10-05 21:20:56 +02:00
Vladimír Čunát
0be2928ac9
Merge branch 'master' into staging
...
Evaluation was blocked on Hydra; this should fix it.
2017-10-05 12:34:05 +02:00
Orivej Desh
0eb0a404e5
Merge pull request #30082 from makefu/pkgs/devpi-client/update
...
devpi-client: 2.7.0 -> 3.1.0rc1
2017-10-05 09:01:21 +00:00
Vincent Laporte
c06e5a8d64
ocamlPackages.react: 1.2.0 -> 1.2.1
2017-10-05 08:39:50 +00:00
Orivej Desh
7a7847703d
Merge pull request #30096 from dtzWill/update/snowman
...
snowman: 2017-07-22 -> 2017-08-13
2017-10-05 07:49:27 +00:00
Orivej Desh
66d4941afe
Merge branch 'master' into staging
...
* master: (48 commits)
Mathematica: 11.0.1 -> 11.2.0
kbfs: 20170922.f76290 -> 20171004.40555d
packer: 1.0.3 -> 1.1.0
libxdg-basedir: 1.0.2 -> 1.2.0
fscrypt: 0.2.1 -> 0.2.2
devtodo: init at 0.1.20
keybase: 1.0.30 -> 1.0.33
elixir: Fix locale problem on NixOS
keybase-gui: 1.0.25 -> 1.0.33
terraform: 0.10.2 -> 0.10.7 (#30055 )
emby: 3.2.32.0 -> 3.2.33.0
sbcl: 1.3.21 -> 1.4.0
ardour: 5.11 -> 5.12
axoloti: fix evaluation
axoloti: init at 1.0.12-1
melpa-packages: Add new lean packages
fastlane: init at 2.60.1
nixos/traefik: guard example path
go-ethereum: 1.7.0 -> 1.7.1
xzgv: 0.9.1 -> 0.9.2
...
2017-10-05 07:41:39 +00:00
Timo Kaufmann
f8244623a7
Merge remote-tracking branch 'upstream/master'
2017-10-04 21:47:01 -05:00
Siddhanathan Shanmugam
d445ccc833
packer: 1.0.3 -> 1.1.0
2017-10-04 21:27:37 -04:00
Frank Doepper
05176ba836
devtodo: init at 0.1.20
2017-10-04 22:08:52 +00:00
Will Dietz
31a903bada
snowman: 2017-07-22 -> 2017-08-13
...
Minor update but notably includes fix
for breakage when using cmake 3.9
2017-10-04 15:31:39 -05:00
Diego Zamboni
97d9f0b5bb
vagrant: fix Ruby and libffi libraries on Darwin
...
On Darwin, keep the Ruby and libffi libraries and binaries bundled
with Vagrant instead of linking to the Nix ones, to avoid errors about
libraries not found.
2017-10-04 22:06:39 +02:00
makefu
396836356f
devpi-client: 2.7.0 -> 3.1.0rc1
2017-10-04 14:42:07 +02:00
Domen Kožar
2b70f5e251
jq: sanity check with --help
2017-10-04 12:00:07 +01:00
Orivej Desh
f137004179
Merge branch 'master' into staging
...
* master: (81 commits)
Add NixOS 17.09 AMIs
gradle: 4.2 -> 4.2.1
maintainers.nix: use my GitHub handle as maintainer name
fcitx-engines.rime: init at 0.3.2
brise: init at 2017-09-16
librime: init at 1.2.9
marisa: init at 0.2.4
opencc: build shared library and programs
josm: 12712 -> 12914
exa: 0.7.0 -> 0.8.0
krb5: add deprecation date for old configuration
rustRegistry: 2017-09-10 -> 2017-10-03
go-ethereum: Fix libusb segmentation faults on Darwin
tor-browser-bundle-bin: 7.0.5 -> 7.0.6
libsodium: 1.0.13 -> 1.0.15
tor-browser-bundle: geoip support
tor-browser-bundle: support transports obfs2,obfs3
tor-browser-bundle: bump https-everywhere to 2017.9.12
tint2: limit platforms to Linux since macOS is not supported and fails the tests
eclipse-plugin-vrapper: init at 0.72.0
...
2017-10-03 17:46:39 +00:00
Orivej Desh
b465d9c1ff
Merge pull request #29460 from sifmelcara/add/rime
...
fcitx-engines.rime: init at 0.3.2
2017-10-03 15:07:16 +00:00
Tim Steinbach
89e451f713
gradle: 4.2 -> 4.2.1
2017-10-03 10:53:23 -04:00
mingchuan
d6b8ac6ca8
maintainers.nix: use my GitHub handle as maintainer name
2017-10-03 14:27:10 +00:00
Daiderd Jordan
2066cb0b02
jq: don't add rpath on darwin
2017-10-03 00:18:30 +02:00
Harmen
fff93f5a59
phantomjs2: add qtbase's bin to PATH
2017-10-02 23:40:59 +02:00
Daiderd Jordan
fced3c2f18
Merge pull request #29938 from pmahoney/universal-ctags-darwin
...
universal-ctags: include libiconv on darwin
2017-10-02 18:28:57 +02:00
Patrick Mahoney
859a4c30cf
universal-ctags: include libiconv on darwin
2017-10-02 09:48:25 -05:00
Jörg Thalheim
b370700d37
Merge pull request #30017 from zzamboni/vagrant-2.0.0
...
vagrant: 1.9.5 -> 2.0.0
2017-10-02 10:53:55 +01:00
Diego Zamboni
9bcd1de373
vagrant: 1.9.5 -> 2.0.0
...
Upgrade to latest version of Vagrant.
After installation, the following messages appear whenever vagrant runs.
These were already present in previous versions, I'm not sure if/what
to do about them:
Ignoring ffi-1.9.18 because its extensions are not built. Try: gem pristine ffi --version 1.9.18
Ignoring unf_ext-0.0.7.4 because its extensions are not built. Try: gem pristine unf_ext --version 0.0.7.4
Ignoring wdm-0.1.1 because its extensions are not built. Try: gem pristine wdm --version 0.1.1
2017-10-02 10:06:03 +02:00
makefu
46b71a1637
iozone: enable aarch64-linux build
...
add myself to list of maintainers
2017-10-02 10:00:20 +02:00
Orivej Desh
fda26c8476
Merge branch 'master' into staging
...
* master: (271 commits)
pysmbc: clarify license
pysmbc: fix license
bazel: 0.5.4 -> 0.6.0 (#29990 )
googler: init at 3.3
go: declare support for aarch64
firefox-beta-bin: 56.0b5 -> 57.0b4
spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
gogs: 0.11.19 -> 0.11.29
grafana: 4.5.1 -> 4.5.2
mopidy-iris: 3.4.1 -> 3.4.9
nextcloud: 12.0.2 -> 12.0.3
haskell-json-autotype: jailbreak to fix build within LTS 9.x
kore: fix up
kore: init at 2.0.0
glusterfs service: fix issues with useRpcbind
tig: 2.2.2 -> 2.3.0
haskell-hspec-core: enable test suite again
hackage-packages.nix: automatic Haskell package set update
librsvg: fix thumbnailer path
awscli: 1.11.108 -> 1.11.162
...
2017-10-02 00:22:12 +00:00
Yann Hodique
1fcf8e24a0
bazel: 0.5.4 -> 0.6.0 ( #29990 )
2017-10-01 18:46:16 -04:00
Jörg Thalheim
94ee0f5d5b
Merge pull request #29808 from kirelagin/mkdocs
...
mkdocs: Initialise at 0.16.3
2017-10-01 11:01:11 +01:00
Joerg Thalheim
fa2adc6129
mkdocs: run tests
2017-10-01 10:56:05 +01:00
Orivej Desh
5bf29702b7
Merge pull request #29533 from sivteck/rosDevChan
...
vcstool: init at 0.1.31
2017-10-01 09:36:00 +00:00
Robin Gloster
40ed226507
treewide: mark a bunch of failing builds as broken
...
(cherry picked from commit 23fdbaa37599f490435056b9865023870656571b)
[dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]
2017-10-01 00:26:52 +03:00
Tuomas Tynkkynen
fd97fa71dd
darwin: Disable some more packages that have never built
...
streamripper: https://hydra.nixos.org/build/61726659
racket: https://hydra.nixos.org/build/61750850
radare: https://hydra.nixos.org/build/61756146
stockfish: https://hydra.nixos.org/build/61726172
2017-09-30 22:32:27 +03:00
Judson
b62012fe2d
kafkacat: init at 1.3.1
2017-09-29 21:12:21 +00:00
Pascal Bach
824f2e2a28
gitlab-runner: 9.5.0 -> 10.0.0 ( #29821 )
...
The renaming of gitlab-ci-mutli-runner to gitlab-runner
is finally complete. Symlinking is thus no longer needed.
2017-09-29 14:00:25 +00:00
Tim Steinbach
e55a92141e
Merge pull request #29639 from NeQuissimus/gradle_4_2
...
gradle: 4.1 -> 4.2
2017-09-29 09:06:09 -04:00
Ruben Maher
96939d5a0d
flow: 0.55.0 -> 0.56.0
2017-09-29 08:54:16 +09:30
Charles Strahan
b93ba5dcd7
envoy: fix by reviving bazel 0.4
...
/cc #28643
2017-09-28 16:51:32 -04:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
xd1le
d063880986
gwrap: set version in mkDerivation
2017-09-28 14:51:41 +02:00
xd1le
de9c86f81a
gwrap: switch maintainer from taktoa to vyp
2017-09-28 14:51:41 +02:00
xd1le
468626ce86
gwrap: code style nits
2017-09-28 14:51:41 +02:00
Orivej Desh
f86e253b28
Merge pull request #29850 from vyp/fix/guile-lint
...
guile-lint: fix build by building with guile 1.8
2017-09-28 11:54:32 +00:00
Kirill Elagin
d70f426dfc
mkdocs: Initialise at 0.16.3
2017-09-28 14:21:17 +03:00
xd1le
262b1cb401
guile-lint: set version in mkDerivation
2017-09-28 20:51:20 +10:00
Timo Kaufmann
18774fb82b
sqldeveloper: 4.1.1 -> 17.2.0
2017-09-27 18:36:37 -05:00
Vladimír Čunát
e83b78b3ed
Merge older staging
...
This is almost fully rebuilt on staging (waiting for ~7.5k Darwin jobs),
but now master got ~17k rebuild, so staging wouldn't catch up this way.
2017-09-27 20:51:14 +02:00
xd1le
89238b8628
guile-lint: use substituteInPlace instead of sed for prePatch
2017-09-27 23:48:42 +10:00
xd1le
ea4adc5f5f
guile-lint: patchPhase -> prePatch
2017-09-27 23:42:16 +10:00
xd1le
e7e52d4b83
guile-lint: use https src url
2017-09-27 23:36:12 +10:00
xd1le
3748013d22
guile-lint: add vyp as maintainer
2017-09-27 23:33:01 +10:00
xd1le
a4601f9f40
guile-lint: add meta.platforms, with the same value as for guile
2017-09-27 23:32:03 +10:00
xd1le
5352a105f7
guile-lint: use correct license value, "GPL" -> gpl3Plus
2017-09-27 23:30:16 +10:00
xd1le
727fa0d81d
guile-lint: use https version of homepage
2017-09-27 23:28:35 +10:00
xd1le
f311898f67
guile-lint: remove package name prefix from meta.description
2017-09-27 23:28:07 +10:00
xd1le
14befbf78d
guile-lint: code formatting nits
2017-09-27 23:27:26 +10:00
xd1le
fd03758305
guile-lint: fix build by building with guile 1.8
...
[1] gives us the indication that guile-lint should be used with
guile-1.8.
[1]: https://www.gnu.org/software/guile/libraries/
2017-09-27 23:18:02 +10:00
Vladimír Čunát
41aa302727
Merge branch 'master' into staging
2017-09-26 22:31:59 +02:00
Tim Steinbach
4ec02cc332
skopeo: 0.1.22 -> 0.1.23
2017-09-26 10:12:36 -04:00
Jörg Thalheim
8a1fb4b504
Merge pull request #29702 from robertodr/watson-ruby
...
watson-ruby: init at 1.6.3
2017-09-25 15:51:17 +01:00
Joerg Thalheim
407d8dac85
watson-ruby: hide bundlerEnv to avoid collisions
...
bundlerEnv also comes with a bundle script and ruby libraries
2017-09-25 15:49:14 +01:00
Roberto Di Remigio
932bd98510
watson-ruby: init at 1.6.3
2017-09-25 14:51:16 +01:00
ibor
00422b2279
js_of_ocaml: fix jbuild (explicitly call bash) ( #29749 )
...
* js_of_ocaml: fix jbuild (explicitly call bash)
* js_of_ocaml: Use patchShebangs instead of manual patch
2017-09-25 08:32:19 +08:00
Vladimír Čunát
cb9a846762
Merge older staging
...
Hydra looks OK; not finished yet but already has more successes than
on master.
2017-09-24 20:56:11 +02:00
Stefan Siegl
24ab22bea8
gn: fix sandbox build
2017-09-24 19:23:20 +02:00
Jörg Thalheim
5fa6b341fb
Merge pull request #29732 from vyp/maintain-guile-modules
...
guile-modules: add vyp as maintainer to unmaintained guile modules
2017-09-24 15:16:51 +01:00
xd1le
d7d33bd17c
guile-modules: rename top level attributes to be consistent
2017-09-24 22:24:49 +10:00
Stefan Siegl
665918c24a
gn: init at 0.0.0.20170629
2017-09-24 11:37:28 +02:00
Vladimír Čunát
cea9a52dac
cmake: maintenance 3.9.1 -> 3.9.2
2017-09-24 11:28:30 +02:00
Winnie Quinn
331f5a75ce
opam: use aspcud on darwin
...
aspcud is the recommended solver for OPAM and the `aspcud` package is
now building properly on Darwin. As such, we can remove the special case
for Darwin that required OPAM to fall back to the built-in solver.
2017-09-23 16:47:24 -04:00
Joachim F
dbf4d4ebb5
Merge pull request #29658 from teto/ctags
...
universal-ctags: generate manpage
2017-09-23 12:04:06 +00:00
Vladimír Čunát
73282c8cc2
Merge branch 'master' into staging
...
Thousands of rebuilds from master :-/
2017-09-23 09:57:23 +02:00
Matthieu Coudron
5c4ddc30d3
universal-ctags: 2017-01-08 -> 2017-09-22
2017-09-23 16:53:20 +09:00
Daiderd Jordan
1acf6716aa
textql: fix darwin build
2017-09-22 21:25:34 +02:00
Matthieu Coudron
c2f928d44e
universal-ctags: generate manpage
2017-09-22 15:56:02 +09:00
Joachim F
82a4b755b1
Merge pull request #29621 from joachifm/pkg/hydra-git
...
hydra: 2017-07-27 -> 2017-09-14
2017-09-21 20:28:40 +00:00
John Ericson
ed14223f8c
treewide: Manual fix more pkg-config build-inputs
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9
misc pkgs: Basic sed to get fix pkgconfig
and autoreconfHook
buildInputs
...
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Jörg Thalheim
a0017e2904
Merge pull request #29252 from dywedir/tokei
...
tokei: 6.0.1 -> 6.1.2
2017-09-21 20:42:57 +01:00
Peter Simons
a68eea3cb0
Merge pull request #29089 from LnL7/vaultenv-0.5.0
...
vaultenv: init at 0.5.0
2017-09-21 21:13:53 +02:00
Vladimír Čunát
4683c374fa
Merge branch 'master' into staging
...
A couple thousand rebuilds again.
2017-09-21 21:09:32 +02:00
Jake Waksbaum
a3ba600366
ocamlPackages.merlin: 2.5.4 -> 3.0.2 ( #29337 )
2017-09-21 19:39:36 +01:00
Tim Steinbach
b390773310
gradle: 4.1 -> 4.2
2017-09-21 07:56:53 -04:00
Joachim Fasting
3e96cee147
hydra: 2017-07-27 -> 2017-09-14
...
Builds against recent nixUnstable
2017-09-21 01:02:02 +02:00
Joachim F
29c1888a57
Merge pull request #29560 from LumiGuide/elk-5.6.1
...
elk: 5.5.2 -> 5.6.1
2017-09-20 21:56:26 +00:00
Michael Weiss
9182927998
gengetopt: Fix the build
...
Thanks @orivej for providing this fix.
Fix #28255 (the build was broken since
2bc7b4e134
).
2017-09-20 19:32:06 +02:00
Tim Steinbach
e200cfbae1
sbt: 1.0.1 -> 1.0.2
2017-09-20 09:42:03 -04:00
Sivaram Balakrishnan
62a884e0c7
vcstool: init at 0.1.31
...
Adds vcstool application. Initial work to get ROS2 packages on Nix.
2017-09-20 14:08:16 +05:30
John Ericson
e9c1f64048
Merge branch 'master' into staging
2017-09-20 01:39:59 -04:00
Ruben Maher
1787043323
flow: 0.54.0 -> 0.55.0
2017-09-20 10:12:36 +09:30
Vladimír Čunát
d4c33d5e4e
Merge branch 'master' into staging
2017-09-19 18:03:09 +02:00
Bas van Dijk
ea8e7ed1e3
elk: 5.5.2 -> 5.6.1
...
Release notes:
* https://www.elastic.co/guide/en/elasticsearch/reference/5.6/release-notes-5.6.1.html
* https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-1.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.6.1.html
2017-09-19 10:52:08 +02:00
Elis Hirwing
0eb1fdc50a
gocode: 20170530 -> 20170903
2017-09-18 17:53:25 +02:00
Daiderd Jordan
036036a456
Merge pull request #29254 from knedlsepp/fix-valgrind
...
valgrind: Fix darwin build
2017-09-17 20:09:56 +02:00
Vladimír Čunát
96647a6985
Merge #29311 : texinfo: 6.3 -> 6.5
2017-09-17 10:35:43 +02:00
Joachim Fasting
40d6414863
lttng-uts: 2.9.1 -> 2.10.0
2017-09-17 09:44:04 +02:00
Joachim Fasting
969db57853
lttng-tools: 2.9.5 -> 2.10.1
2017-09-17 09:44:04 +02:00
Samuel Leathers
7ffea453b8
jscoverage: fix build with gcc6 ( #29423 )
2017-09-16 13:20:38 +02:00
Frederik Rietdijk
03fa6965ad
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-16 12:34:32 +02:00
Josef Kemetmueller
c71fd76822
valgrind: Fix darwin build
...
The bzero-patch was merged upstream in
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16103, so it does no
longer apply.
Additionally - to make the build succeed on darwin systems more recent
than our nixpkgs.darwin.xnu kernel version - we need to teach the build
the version of the xnu headers we provide, instead of letting the build
figure out the actual system version using `uname -r`.
2017-09-15 14:55:38 +02:00
Jörg Thalheim
419869269d
Merge pull request #28635 from ThomasMader/ldc
...
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
Daiderd Jordan
d1260ea6aa
irony-server: don't use wrapped clang
2017-09-14 22:23:48 +02:00
Daiderd Jordan
3c70ed9577
rtags: fix darwin build
2017-09-14 22:02:11 +02:00
Daiderd Jordan
cd97211358
rtags: use clang-unwrapped
2017-09-14 20:17:01 +02:00
John Ericson
e5567bae2d
treewide: Do not limit hardenging because gcc 4.9 in bootstrap
...
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
Orivej Desh
a4a187fe5f
include-what-you-use: 0.6 -> 0.8
2017-09-13 22:07:23 +00:00
Jörg Thalheim
b6c68c34e5
Merge pull request #29327 from jtojnar/fix/meson-0.42.1
...
meson: 0.41.2 → 0.42.1
2017-09-13 22:16:32 +01:00
Tuomas Tynkkynen
1e84bb90d4
strace: 4.18 -> 4.19
2017-09-14 00:00:02 +03:00
Jan Tojnar
ad8e4c272a
meson: 0.41.2 → 0.42.1
2017-09-13 22:37:30 +02:00
Matthias Beyer
65b91cd23b
sqlitebrowser: 3.9.1 -> 3.10.0
2017-09-13 21:44:49 +02:00
Lancelot SIX
1ed3ca23ba
texinfo: 6.3 -> 6.5
...
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00011.html
and http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00007.html
for release informations.
2017-09-13 15:26:40 +02:00
Tuomas Tynkkynen
2cd2ee5f85
prelink: Disable on Darwin
...
https://hydra.nixos.org/build/60439488
A tool that works on ELF files only isn't probably that useful on
Darwin.
2017-09-13 14:48:10 +03:00
Vladimír Čunát
422adc3063
Merge branch 'staging'
...
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Jörg Thalheim
2d77958271
Merge pull request #29007 from mguentner/avrclean
...
avr-*: split avr-gcc-libc into separate packages
2017-09-12 10:28:56 +01:00
Jörg Thalheim
e9040c5161
Merge pull request #29262 from sifmelcara/update/spin
...
spin: 6.4.6 -> 6.4.7
2017-09-12 09:31:04 +01:00
mingchuan
cb8bfbdbba
spin: 6.4.6 -> 6.4.7
2017-09-12 15:52:23 +08:00
Guillaume Massé
49c7bed763
sbt-with-scala-native: does not support sbt 1.X yet ( #29148 )
...
https://github.com/scala-native/scala-native/issues/915
2017-09-12 08:43:40 +01:00
Jörg Thalheim
b1140f92cc
Merge pull request #29227 from gleber/beam-tooling-upgrade
...
beam: tooling upgrade (rebar3, hex2nix, relx, etc)
2017-09-12 08:24:15 +01:00
Artem Kazakov
60709abb82
buildbot: add wsgi dashboards plugin
...
fixes #29236
2017-09-12 08:16:57 +01:00
dywedir
69379fcf10
tokei: 6.0.1 -> 6.1.2
2017-09-12 00:55:06 +03:00
Gleb Peregud
52f8bec64b
hex2nix: 0.0.5 -> 0.0.6
2017-09-11 23:03:49 +02:00
Gleb Peregud
b8adacf7e2
relx-exe: 3.18.0 -> 3.23.1
2017-09-11 23:03:49 +02:00
Gleb Peregud
adbc1ed0d9
rebar3: 3.3.2 -> 3.4.3
2017-09-11 22:56:43 +02:00
Frederik Rietdijk
628b6c0e9d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-11 22:52:53 +02:00
Tuomas Tynkkynen
e61022ac55
dbench: Disable on Darwin
...
Assumes Linux versions of xattr system calls. Has never built
successfully.
https://hydra.nixos.org/build/60443210
2017-09-11 16:35:05 +03:00
James Kay
cf497c60f0
buildbot: 0.9.9post2 -> 0.9.11
2017-09-11 13:25:53 +01:00
Daiderd Jordan
92163ec65c
glslviewer: fix darwin build
2017-09-10 17:24:20 +02:00
Jörg Thalheim
ad4f798c0b
Merge pull request #29185 from markus2342/update-oprofile
...
oprofile: 1.1.0 -> 1.2.0
2017-09-10 12:02:29 +01:00
Jörg Thalheim
a26817b215
oprofile: fix hardcoded rm/cp paths
2017-09-10 12:01:40 +01:00
Jörg Thalheim
72673e67f2
arm-frc-linux-gnueabi-binutils: mark as broken
2017-09-10 11:40:39 +01:00
Markus Mueller
79f13f19f0
oprofile: 1.1.0 -> 1.2.0
...
Fixes build with newer gcc versions.
2017-09-10 09:31:11 +00:00
Frederik Rietdijk
dab3272f47
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-10 08:56:39 +02:00
Arseniy Seroka
554ed27ebd
Merge pull request #29085 from dtzWill/update/rr-5.0
...
rr: 4.5.0 -> 5.0.0
2017-09-09 15:18:08 +03:00
Daiderd Jordan
c3f6b53bb6
vaultenv: init at 0.5.0
2017-09-09 12:43:04 +02:00
Frederik Rietdijk
febd5e323d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-08 20:48:14 +02:00
Lancelot SIX
653cad7a3c
gdb: 8.0 -> 8.0.1
...
See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00005.html
for release information.
2017-09-08 17:51:23 +02:00
zimbatm
2ae7e952b2
yarn: 0.28.4 -> 1.0.1
2017-09-07 18:10:09 +01:00
Will Dietz
b95dc6f7d6
rr: 4.5.0 -> 5.0.0
2017-09-07 12:05:09 -05:00
Nikolay Amiantov
e5059a8739
bazel: 0.4.5 -> 0.5.4
2017-09-07 17:04:29 +03:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
...
This reverts commit 0a944b345e
, reversing
changes made to 61733ed6cc
.
I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
Peter Hoeg
0bac95c976
rake: 11.1.0 -> 12.0.0
2017-09-07 17:50:36 +08:00
Frederik Rietdijk
d38ee5b46c
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-07 09:29:44 +02:00
Frederik Rietdijk
b1504b444b
conan: 0.21.2 -> 0.26.2, and fix build
2017-09-07 09:28:03 +02:00
Frederik Rietdijk
9e27b88141
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-06 20:17:53 +02:00
Joachim F
8eb195d0da
Merge pull request #28852 from Balletie/fix/rtags-configure-prefix
...
rtags: Fix configure phase errors
2017-09-06 14:45:39 +00:00
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
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
Andreas Rammhold
14c3ce919b
rustup: 1.2.0 -> 1.3.0
2017-09-05 22:27:30 +02:00
Franz Pletz
bbeeee220a
Merge remote-tracking branch 'origin/master' into staging
2017-09-05 20:14:08 +02:00
Franz Pletz
1bed4773f5
postgresql92: remove last references
2017-09-05 18:20:56 +02:00
John Ericson
252b36a28d
misc pkgs: Recategorize some dependencies
2017-09-05 11:37:10 -04:00
Fatih Altinok
ec39670290
flow: 0.49.1 -> 0.54.0
2017-09-05 16:03:37 +03:00
Robin Gloster
8502d94b31
jenkins: 2.73 -> 2.77
2017-09-05 14:42:46 +02:00
Franz Pletz
c6e5fc0b36
babeltrace: 1.2.4 -> 1.5.3
2017-09-05 14:24:58 +02:00
Franz Pletz
1c4d28539f
autoconf-archive: 2016.09.16 -> 2017.03.21
2017-09-05 14:24:57 +02:00
Maximilian Güntner
b22718d51c
simavr: fix build for separate avr toolchain
2017-09-05 13:54:14 +02:00
Frederik Rietdijk
d7ef196c26
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-05 10:11:06 +02:00
Michele Catalano
e783c2b39c
nexus: 2.12.0-01 -> 3.5.1-02
...
Update Nexus to version 3.5.1-02 and fix startup stript to run in nix
environment.
2017-09-04 22:32:02 +02:00
Daiderd Jordan
86696e07c7
Merge pull request #28868 from matthewbauer/xcbuild-fix-sdk
...
xcbuild: fix sdk dir name issue
2017-09-03 21:34:46 +02:00
John Ericson
0a944b345e
Merge pull request #28557 from obsidiansystems/binutils-wrapper
...
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Tim Steinbach
aa59865333
sbt: 1.0.0 -> 1.0.1
2017-09-02 12:54:50 -04:00
Austin Seipp
e3bc5171df
icestorm: 2016.11.01 -> 2017.08.31
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05:00
Thomas Mader
930b01ab3d
dtools: Fix rdmd test when building with newer phobos version which doesn't include std.stdiobase.d anymore.
2017-09-02 08:30:17 +02:00
Thomas Mader
8a2a3dad80
ldc: Init at 1.3.0
2017-09-02 08:30:17 +02:00
Matthew Bauer
f8f3384638
xcbuild: fix sdk dir name issue
...
Previously, this error was coming up in xcbuild:
ld: malformed 32-bit x.y.z version number: 1068638
It’s an interesting error because it only happens with certain hashes for the
nixpkgs sdk. For instance, on latest nixpkgs unstable channel, the hash for the
xcbuild sdk is:
/nix/store/w6mwbdaz9calyii0fyxspl51f1068638-nix.nixpkgs.sdk
that is an issue we pass -isysroot ${sdk} to clang where it will interpret that
hanging "1068638". It would probably go away as soon as the hash changes but
this hacky fix will solve the problem.
2017-09-01 15:11:12 -05:00
John Ericson
3f30cffa55
misc pkgs: Use $NIX_BINUTILS for when needed
...
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
Balletie
311a1ee33a
rtags: Fix configure phase errors
...
Add pkgconfig as buildinput, so that the install path is correctly set
with cmake. PkgConfig is an optional dependency for rtags, but they
say it's necessary if you want to replace the prefix with
CMAKE_INSTALL_PREFIX. See:
caad9ac494/cmake/BashCompletion.cmake (L13)
Furthermore, I let the configurePhase of the rtags emacs package be a
noop.
2017-09-01 16:41:49 +02:00
Samuel Leathers
39154ab86f
bossa: fix build with gcc6
2017-08-31 22:44:56 -04:00
Peter Simons
91054336ce
multi-ghc-travis: update to latest git head
2017-08-31 21:42:55 +02:00
Jörg Thalheim
ed997b153c
Merge pull request #28756 from disassembler/pulseview-sigrok
...
pulseview and sigrok updates
2017-08-31 09:28:44 +01:00
Frederik Rietdijk
6d4bd78fad
Merge commit '2858c41' into HEAD
2017-08-30 21:07:07 +02:00
Samuel Leathers
902dc73ee2
sigrok-cli: 0.6.0 -> 0.7.0
2017-08-30 14:04:31 -04:00
Samuel Leathers
3e1fa824df
libsigrokdecode: 0.4.1 -> 0.5.0
2017-08-30 13:52:17 -04:00
Samuel Leathers
afa5dcbd7d
libsigrok: 0.4.0 -> 0.5.0
2017-08-30 13:52:12 -04:00
Dan Peebles
b8538c6801
chromedriver: fix on Darwin
...
A refactor broke it by forcing a bunch of Linux-specific dependencies on
Darwin that only get used in the patchelf invocation.
2017-08-30 11:49:34 -04:00
William Casarin
dfeb8bd4b5
stagit: init at 0.6
...
a git static site generator
2017-08-30 13:12:17 +02:00
Théo Zimmermann
a9be3c20d1
ocamlPackages.ppx_deriving: 4.1 -> 4.2
...
This fixes compilation of ppx_deriving with OCaml 4.05.
js_of_ocaml_2: mark as broken with OCaml 4.05
ocamlPackages.cohttp: propagates ppx_deriving
2017-08-30 02:33:23 +00:00
Will Dietz
5543e992f1
snowman: init at 2017-07-22
2017-08-30 02:30:19 +02:00
Will Dietz
1a16760bf0
massif-visualizer: 0.3.90 unstable -> 0.4.0 stable
2017-08-30 00:59:32 +02:00
Joachim Fasting
f2d1abf366
cppcheck: 1.79 -> 1.80
2017-08-29 21:35:22 +02:00
Jörg Thalheim
6a875034dc
Merge pull request #28675 from calvertvl/update-loccount-1.1
...
loccount: 1.0 -> 1.1
2017-08-29 11:56:23 +01:00
Victor Calvert
51c713c538
loccount: 1.0 -> 1.1
2017-08-29 06:01:05 -04:00
Jörg Thalheim
6b93afd39f
Merge pull request #28655 from dywedir/rust-bindgen
...
rust-bindgen: 0.29.0 -> 0.30.0
2017-08-29 10:50:49 +01:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
...
There were some conflicts in python modules, commented at #28314 .
2017-08-29 10:51:54 +02:00
Gabriel Ebner
92523344d1
tokei: 6.0.0 -> 6.0.1
2017-08-29 10:40:14 +02:00
dywedir
f71d121173
rust-bindgen: 0.29.0 -> 0.30.0
2017-08-29 00:14:20 +03:00
Bastian Köcher
0da61beee9
xxdiff-tip: 20170101 -> 20170623
...
Updates the xxdiff-tip version and fixes compilation errors by forcing qt5.6.
2017-08-28 22:14:11 +02:00
Vladimír Čunát
e0010cd1c3
pprof: init at 2017-08-28
2017-08-28 18:46:40 +02:00
Robin Gloster
556029c904
elfutils: 0.169 -> 1.170
2017-08-27 22:51:53 +02:00
Lukas Werling
f0a1ab78b4
meson/ninja: add setup hooks ( #28444 )
...
* Add setupHook for meson/ninja build
* libhttpseverywhere: Use meson/ninja setupHooks
* jamomacore: Remove superfluous ninja buildInput
* Remove obsolete ninja buildPhases
These are all handled by ninja's setup hook.
* lean2, xcbuild: fix build with ninja setup hook
Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.
* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
Vincent Laporte
935e991b72
js_of_ocaml: 2.8.4 -> 3.0.0
...
js_of_ocaml-camlp4: init at 3.0.0
js_of_ocaml-ppx: init at 3.0.0
2017-08-27 14:55:12 +00:00
Vincent Laporte
4b1a1c1846
js_of_ocaml-ocamlbuild: init at 3.0.0
2017-08-27 14:36:25 +00:00
Vincent Laporte
ef2c0f317a
js_of_ocaml-compiler: move
2017-08-27 14:29:57 +00:00
Vincent Laporte
4c23d059f5
obelisk: fix hash
2017-08-27 10:20:41 +02:00
Pascal Bach
d3b5fa3db2
gitlab-runner: 9.4.2 -> 9.5.0
2017-08-27 10:01:25 +02:00
Vincent Laporte
b07d148e1d
obelisk: 0.2.0 -> 0.3.0
2017-08-27 06:56:35 +00:00
Leandro Lisboa Penz
fc7397d66b
Revert "gnu global: set path of default gtags.conf in wrapper"
...
This reverts commit bd0d64730a
.
Setting GTAGSCONF is not an adequate solution as it prevents the use of
it and the way it was done also breaks gtags when it is called by
global.
Fixes NixOS/nixpkgs#26971
2017-08-27 04:36:45 +02:00
Franz Pletz
b3d123fba5
uhd: 3.10.1.1 -> 3.10.2.0
2017-08-27 02:33:33 +02:00
Roger Qiu
9bdf89692c
flyway: init at 4.2.0 ( #28586 )
...
* flyway: init at 4.2.0
* flyway: simplify install phase
2017-08-26 13:44:39 +01:00
Jörg Thalheim
9ece4aad10
Merge pull request #28407 from ThomasMader/dtools
...
dtools: rdmd -> dtools
2017-08-26 08:16:30 +01:00
Frederik Rietdijk
665d393919
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-25 19:39:41 +02:00
Frederik Rietdijk
656e14f64f
Merge remote-tracking branch 'upstream/python-wip' into HEAD
2017-08-25 19:37:57 +02:00
Frederik Rietdijk
84adeffc6d
mypy: 0.511 -> 0.521
2017-08-25 19:36:16 +02:00
Jörg Thalheim
f7ae955bc2
Merge pull request #28524 from Ralith/electron
...
electron: 1.6.6 -> 1.7.5
2017-08-25 09:56:12 +01:00
Jörg Thalheim
f9127f8293
Merge pull request #28525 from moaxcp/master
...
visualvm: 1.3.8 -> 1.3.9
2017-08-25 08:06:56 +01:00
WilliButz
8ddc3eb988
watchman: 4.7.0 -> 4.9.0
2017-08-24 21:20:03 +02:00
Vincent Laporte
77404dbf37
jbuilder: 1.0+beta7 -> 1.0+beta12
...
ocamlPackages.sexplib: 0.9.1 -> 0.9.2
ocamlPackages.base: 0.9.1 -> 0.9.3
ocamlPackages.ppx_driver: 0.9.0 -> 0.9.1
ocamlPackages.bin_prot: 0.9.0 -> 0.9.1
ocamlPackages.ppx_inline_test: 0.9.0 -> 0.9.2
2017-08-24 17:53:55 +00:00
Vincent Laporte
01495f3255
ocamlPackages.js_of_ocaml-compiler: init at 0.3.0
2017-08-24 17:49:05 +00:00
John Mercier
d4ccf3f1b2
visualvm: 1.3.8 -> 1.3.9
2017-08-23 21:14:57 -04:00
Benjamin Saunders
0df187a17a
electron: 1.6.6 -> 1.7.5
2017-08-23 17:49:40 -07:00
Tuomas Tynkkynen
2fc7651b25
Merge remote-tracking branch 'upstream/master' into staging
2017-08-24 02:08:32 +03:00
Tuomas Tynkkynen
0c0fad6141
treewide: Consistently call ARM 'arm'
...
No need for silly differences.
2017-08-24 01:17:01 +03:00
John Ericson
9884a3b17a
Merge pull request #28374 from obsidiansystems/binutils-arm
...
binutils: Pass --build --host on non-arm
2017-08-23 14:24:04 -04:00
Bas van Dijk
09bde4a2cd
elk: 5.4.2 -> 5.5.2
...
Release notes:
* https://www.elastic.co/guide/en/elasticsearch/reference/5.5/release-notes-5.5.2.html
* https://www.elastic.co/guide/en/logstash/5.5/logstash-5-5-2.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.5.2.html
2017-08-23 01:58:12 +02:00
Matthew Justin Bauer
2eacddf0dc
treewide: homepage URL fixes ( #28475 )
...
* pgadmin: use https homepage
* msn-pecan: move homepage to github
google code is now unavailable
* pidgin-latex: use https for homepage
* pidgin-opensteamworks: use github for homepage
google code is unavailable
* putty: use https for homepage
* ponylang: use https for homepage
* picolisp: use https for homepage
* phonon: use https for homepage
* pugixml: use https for homepage
* pioneer: use https for homepage
* packer: use https for homepage
* pokerth: usee https for homepage
* procps-ng: use https for homepage
* pycaml: use https for homepage
* proot: move homepage to .github.io
* pius: use https for homepage
* pdfread: use https for homepage
* postgresql: use https for homepage
* ponysay: move homepage to new site
* prometheus: use https for homepage
* powerdns: use https for homepage
* pm-utils: use https for homepage
* patchelf: move homepage to https
* tesseract: move homepage to github
* quodlibet: move homepage from google code
* jbrout: move homepage from google code
* eiskaltdcpp: move homepage to github
* nodejs: use https to homepage
* nix: use https for homepage
* pdf2djvu: move homepage from google code
* game-music-emu: move homepage from google code
* vacuum: move homepae from google code
2017-08-22 20:50:04 +02:00
Tim Steinbach
e6b77e2198
ammonite: 1.0.1 -> 1.0.2
2017-08-22 13:16:57 -04:00
Alvar
9fbb6e8e3a
mpfshell: init at 0.8.1 ( #28384 )
2017-08-22 03:38:46 +02:00
Guillaume Massé
a4594e21a8
yarn 0.27.5 -> 0.28.4
2017-08-22 02:11:44 +02:00
John Ericson
0135e61b4c
Merge remote-tracking branch 'upstream/master' into staging
...
That way the tarball job succeeds
2017-08-21 18:42:57 -04:00
WilliButz
267efdc475
valgrind: 3.12.0 -> 3.13.0
...
fetching from sourceware, as linked on http://valgrind.org/downloads/
2017-08-21 23:41:00 +02:00
Robert Helgesson
9459dd27ec
liquibase: clean up installed documentation
...
Fixes #28281 .
2017-08-21 19:35:52 +02:00
Frederik Rietdijk
6bbc3a0b24
Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD
2017-08-21 04:44:40 +02:00
Frederik Rietdijk
04cd1db2b7
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-21 01:28:27 +02:00
Joachim F
8608d32ad6
Merge pull request #27642 from holidaycheck/update-chromedriver-to-2.31
...
chromedriver: 2.29 -> 2.31
2017-08-20 20:04:06 +00:00
Vladimír Čunát
ff1bb5c854
intel-gpu-tools: fixup build after automake update #28232
2017-08-20 09:22:52 +02:00
Thomas Mader
58ed023bc6
dtools: rdmd -> dtools
...
- Remove single rdmd derivation and introduce new dtools derivation with more tools from the repository.
- Update rdmd/dtools 2.067.0 -> 2.075.1
- Adding checkPhase
- Fixing dependencies
- Update derivation description
2017-08-19 23:11:12 +02:00
Jörg Thalheim
66134d67ff
Merge pull request #28361 from volth/patch-52
...
radare2: 1.4.0 -> 1.6.0
2017-08-19 19:06:17 +01:00
Joachim F
b34c87ffe0
Merge pull request #28357 from jpierre03/pr-godot
...
godot: homepage link with httpS
2017-08-19 17:11:13 +00:00
John Ericson
41abe41fd9
binutils: Pass --build --host on non-arm
...
This is needed for build != host == target builds. Moreoever, we want
to move towards always passing all 3, and the previous change to
unbreak Arm moved us away from that.
2017-08-18 13:00:24 -04:00
Vladimír Čunát
6a60cca7ab
Merge: binutils: downgrade 2.29 -> 2.28.1
...
2.29 seems to need time to stabilize upstream. Fixes #28257 .
Discussion: https://github.com/NixOS/nixpkgs/commit/0e18f28cec
2017-08-18 09:42:58 +02:00
volth
9af4150f38
radare2: 1.4.0 -> 1.6.0
2017-08-18 01:53:24 +00:00
volth
a0d87c6885
Delete 2.5.nix
...
delete orphan file
```gradle_2_5``` is in ```default.nix```
2017-08-18 01:46:50 +00:00
Jean-Pierre PRUNARET
41bad11dde
godot: homepage link with httpS
2017-08-17 22:13:32 +02:00
Frederik Rietdijk
8f2ea38f8f
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-17 18:34:17 +02:00
Tuomas Tynkkynen
88efc22b44
binutils: Don't pass --host etc. when not cross-compiling
...
Or linuxHeaders build fails on ARM (non-cross) since e826a6a247
:
````
HOSTCC scripts/basic/fixdep
/nix/store/9glws7v2j28blv1n7azqr3b43qadjd1j-binutils-2.28.1/bin/ld: unrecognised emulation mode: armelf_linux_eabi
Supported emulations: armelf_linux armelf armelfb armelfb_linux
collect2: error: ld returned 1 exit status
````
2017-08-17 18:37:10 +03:00
Tuomas Tynkkynen
d8bea2498d
binutils: Add upgrade notes
2017-08-17 18:37:10 +03:00
Tuomas Tynkkynen
390ccbbf29
binutils: 2.28 -> 2.28.1
2017-08-17 18:37:10 +03:00
Tuomas Tynkkynen
f9b2d7b4dd
Revert "binutils: 2.28 -> 2.29"
...
This reverts commit 733e20fee4
.
Downgrading to 2.28.1, 2.29 is too buggy.
2017-08-17 18:37:04 +03:00
Tuomas Tynkkynen
23547ac24a
Revert "binutils: patch bugs in 2.29"
...
This reverts commit 0e18f28cec
.
Downgrading to 2.28.1, 2.29 is too buggy.
2017-08-17 18:36:58 +03:00
Tuomas Tynkkynen
f660f58c83
Revert "binutils: add missing patches..."
...
This reverts commit ad83979e59
.
Downgrading to 2.28.1, 2.29 is too buggy.
2017-08-17 18:36:38 +03:00
Daiderd Jordan
8932357e04
gdb: remove CPP workaround
2017-08-16 21:38:40 +02:00
Peter Hoeg
d32bf457ef
wp-cli: 1.2.1 -> 1.3.0
2017-08-16 08:39:29 +08:00
Pascal Bach
22fc62eec3
gitlab-runner: 9.3.0 -> 9.4.2
2017-08-15 14:50:50 +02:00
mimadrid
4fb22bb622
meson: 0.40.0 -> 0.41.2
2017-08-15 11:54:43 +02:00
Rickard Nilsson
129f8d7e99
kibana: 4.6.0 -> 4.6.5
...
Fixes CVE-2016-10366
2017-08-14 15:03:12 +02:00
Eelco Dolstra
9eb901b70d
Merge remote-tracking branch 'origin/gcc-6' into staging
2017-08-14 11:38:00 +02:00
Frederik Rietdijk
62dac1bdd9
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-14 09:34:10 +02:00
Frederik Rietdijk
13bbaee21d
Merge pull request #27881 from mimadrid/fix/http-https
...
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Vladimír Čunát
34946256a0
Merge #27424 : stdenv: Don't put man pages into $doc
2017-08-13 19:32:51 +02:00
Frederik Rietdijk
7ebcd39a0f
Merge commit '4c49205' into HEAD
2017-08-13 18:34:59 +02:00
Frederik Rietdijk
2a8cd14d5f
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-13 09:50:47 +02:00
Robin Gloster
1e2529498d
automake113x: remove
2017-08-12 21:49:11 +02:00
Robin Gloster
bfdd9d2e66
automake114x: remove
2017-08-12 20:21:39 +02:00
Robin Gloster
220c5377e8
automake112x: remove
...
unused
2017-08-12 19:12:09 +02:00
Robin Gloster
60730cb043
automake: 1.15 -> 1.15.1
2017-08-12 18:23:26 +02:00
Vladimír Čunát
6899c7fdb9
Merge branch 'master' into gcc-6
2017-08-12 10:09:41 +02:00
Vladimír Čunát
e207d1f04a
Merge older staging
...
There's a security fix for curl.
2017-08-12 09:48:17 +02:00
Anthony Cowley
3a078da8dc
rtags: 2.11 -> 2.12
2017-08-11 22:48:37 +02:00
Tuomas Tynkkynen
1ff422aa23
treewide: Add man & info outputs where necessary (instead of doc)
...
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Franz Pletz
fecca868c3
jenkins: 2.71 -> 2.73
2017-08-11 17:27:32 +02:00
Tim Steinbach
ae5e8dda07
sbt: 0.13.16 -> 1.0.0
2017-08-11 10:22:20 -04:00
Domen Kožar
486e1c3c16
Merge pull request #27998 from davidak/macOS
...
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
volth
031eb79a0b
ccacheWrapper: extraConfig does not handle special characters
...
An independent part of https://github.com/NixOS/nixpkgs/pull/28022
2017-08-10 10:13:17 +00:00
Frederik Rietdijk
b0c30f436e
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-10 10:41:23 +02:00
Robin Gloster
cc5480cb00
csmith: fix wrapProgram call
2017-08-10 00:44:03 +02:00
Daiderd Jordan
bc5160eacd
gdb: fix clang build
2017-08-09 08:41:48 +02:00
Domen Kožar
a082215df5
hydra: 2017-07-24 -> 2017-07-27
2017-08-08 10:50:50 +02:00
davidak
3270aa896b
replace "Mac OS X" and "OS X" with "macOS"
...
as it is the official name since 2016
https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop
exception are parts refering to older versions of macOS like
"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Tim Steinbach
4edcfa3eb7
gradle: 4.0.2 -> 4.1
2017-08-07 11:44:35 -04:00
Robin Gloster
1ff2c65acf
phantomjs2: don't use bundled qt
2017-08-06 20:30:17 +02:00
Robin Gloster
145be4e340
Merge commit 'ad83979e5986fa3bb0d254c2be9482c12a8743b9' from staging
2017-08-06 11:21:53 +02:00
Tim Steinbach
3ed5af74a5
Merge pull request #27894 from jameysharp/cucumber
...
cucumber: init at 2.4.0
2017-08-05 10:30:20 -04:00
Vincent Laporte
c7c24740a9
obelisk: fix hash
2017-08-05 13:29:00 +02:00
Robin Gloster
ad83979e59
binutils: add missing patches...
2017-08-04 08:36:44 +02:00
Robin Gloster
0e18f28cec
binutils: patch bugs in 2.29
...
All are upstream patches, the last two added by handy to work around
them not applying on the changelog.
2.29.1/2.30 will contain the fixes, too.
2017-08-04 08:22:20 +02:00
Vincent Laporte
ef7f980954
obelisk: init at 0.2.0
...
Obelisk is a simple tool which produces pretty-printed output from a Menhir
parser file (.mly).
Homepage: https://github.com/Lelio-Brun/Obelisk
2017-08-04 05:46:07 +00:00
Chris Hodapp
c7864745bd
glslviewer: init at 1.2
2017-08-03 20:58:03 -04:00
Cillian de Róiste
8a1328facb
chromedriver: update homepage
2017-08-03 23:03:03 +02:00
Daiderd Jordan
09a1f99899
Merge pull request #27898 from matthewbauer/irony-server-darwin
...
irony-server: supports darwin
2017-08-03 20:00:15 +02:00
WilliButz
aa8cbedf37
packer: add missing go dependency
2017-08-03 18:48:04 +02:00
John Ericson
74f5fe5068
haskell infra: Misc cleanups
...
- The haskell lib is very close to not relying on Nixpkgs. I think
this is good---simpler to think about and matches Nixpkgs's lib.
- The haskell lib is only imported once
- stdenv is exposed more shallowly so it can be overriden more easily.
I'll eventually use this on Darwin to avoid the Sierra shared
library problems (unless changes are to be made system-wide).
Closes https://github.com/NixOS/nixpkgs/pull/27840 .
2017-08-03 13:12:01 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
...
Homepage link "http://.../ " is a permanent redirect to "https://.../ " and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Matthew Bauer
55b80467c3
irony-server: supports darwin
...
Package should support all unix-like systems.
2017-08-03 01:30:25 -07:00
Frederik Rietdijk
c41b81f0da
intltool: fix url
...
(cherry picked from commit 34aa9a6a40a81ca123d7c2818139d810cfac7ed1)
2017-08-03 10:18:19 +02:00
Jamey Sharp
4ca9f899b1
cucumber: init at 2.4.0
2017-08-02 21:55:55 -07:00
Peter Simons
be0071c2d7
wiggle: fix build
...
After 093cc00cdd
, the environment variable STRIP
is defined to "strip" -- the path / name of the strip(1) executable -- , which
is not what wiggle's build system expects that variable to mean.
2017-08-02 15:36:48 +02:00
Frederik Rietdijk
4f66c0cf21
Merge remote-tracking branch 'upstream/master' into HEAD
2017-08-02 10:22:24 +02:00
Frederik Rietdijk
3b436d12e3
Merge pull request #27744 from NeQuissimus/binutils_staging_2_29
...
[staging] binutils: 2.28 -> 2.29
2017-08-01 22:10:35 +02:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Anthony Cowley
7c690829b2
rtags: 2.10 -> 2.11
2017-08-01 11:15:48 -04:00
Franz Pletz
9dcc09c289
apktool: 2.2.2 -> 2.2.4
2017-08-01 08:36:36 +02:00
Franz Pletz
f520031ee6
packer: 1.0.0 -> 1.0.3
2017-08-01 08:36:35 +02:00
Frederik Rietdijk
740d76371e
Merge commit 'ba68231273bea4cba01413fd2a0e56d68db9234c' into HEAD
2017-07-31 09:12:15 +02:00
vinymeuh
9f5f5865fa
srecord: runs on any flavor of Unix, not only Linux
2017-07-30 23:33:55 +02:00
Jörg Thalheim
eda5b46cab
Merge pull request #27710 from dywedir/rust-bindgen
...
rust-bindgen: 0.26.1 -> 0.29.0
2017-07-30 15:29:34 +01:00
Jörg Thalheim
a5735374af
Merge pull request #27748 from vinymeuh/update_sass
...
libsass & sassc: 3.3.2 -> 3.4.5
2017-07-30 11:29:30 +01:00
vinymeuh
8ba4562324
sassc: 3.3.2 -> 3.4.5
2017-07-30 11:22:37 +01:00
Vladimír Čunát
25c762f2bc
flex-2.5.35: switch source URL
2017-07-30 09:46:13 +02:00
Frederik Rietdijk
20b8e4b4cf
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-30 08:09:11 +02:00
Tim Steinbach
9ea8535fa7
Merge pull request #27717 from NeQuissimus/sbt_0_13_16
...
sbt: 0.13.15 -> 0.13.16
2017-07-30 00:21:55 -04:00
Franz Pletz
5e08c4a2cd
flex: 2.6.3 -> 2.6.4
2017-07-29 19:51:15 +02:00
Tim Steinbach
733e20fee4
binutils: 2.28 -> 2.29
...
Binutils 2.29 no longer allows .semver symbols, which is why
we need to patch glibc to avoid them
2017-07-29 13:23:59 -04:00
volth
d50437ba3e
flex_2_5_35: fix 404
2017-07-29 19:01:07 +02:00
Frederik Rietdijk
b2608b8910
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-29 13:08:11 +02:00
Charles Strahan
2b57cb9169
Merge pull request #25980 from nyarly/bundlerenv_usecases
...
BundlerEnv, now with groups and paths
2017-07-28 23:22:21 -04:00
Tim Steinbach
027323396b
ammonite: 1.0.0 -> 1.0.1
2017-07-28 17:49:53 -04:00
Frederik Rietdijk
55357de67a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-28 19:37:36 +02:00
Tim Steinbach
324197e60e
sbt: 0.13.15 -> 0.13.16
2017-07-28 11:27:35 -04:00
Eelco Dolstra
cc9bfd2cf8
elfutils: Respect $NIX_DEBUG_INFO_DIRS
...
This makes eu-stack and eu-addr2line do the right thing in a
nix-shell (if the appropriate debug outputs are present).
2017-07-28 16:38:26 +02:00
Eelco Dolstra
340bd1ed2e
elfutils: 0.168 -> 0.169
2017-07-28 16:38:26 +02:00
Eelco Dolstra
5c5b71df5e
Add a setup hook to fill NIX_DEBUG_INFO_DIRS
...
This setup hook is propagated by gdb. Thus, a typical use is:
$ nix-shell -p gdb nix nix.debug sqlite.debug ...
and gdb will be able find the debug symbols of nix etc. automatically.
2017-07-28 16:38:26 +02:00
Eelco Dolstra
5b09152898
gdb: Look for .build-id files in NIX_DEBUG_INFO_DIRS
...
This allows us to provide a setup hook that makes debug outputs
findable by gdb.
2017-07-28 16:38:22 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging
2017-07-28 16:08:30 +02:00
dywedir
6c18491470
rust-bindgen: 0.26.1 -> 0.29.0
2017-07-28 13:33:03 +03:00
dywedir
805467bb5a
rustracer: 2.0.6 -> 2.0.9
2017-07-28 11:58:31 +02:00
Mateusz Kowalczyk
519b987e70
jenkins: 2.66 -> 2.71
2017-07-27 13:21:59 +01:00
Tim Steinbach
8b3e9a1358
gradle: 4.0.1 -> 4.0.2
2017-07-26 14:19:01 -04:00
John Ericson
9be40841ea
Merge remote-tracking branch 'upstream/master' into staging-base
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/build-support/gcc-wrapper-old/builder.sh
pkgs/build-support/trivial-builders.nix
pkgs/desktops/kde-4.14/kde-package/default.nix
pkgs/development/compilers/openjdk-darwin/8.nix
pkgs/development/compilers/openjdk-darwin/default.nix
pkgs/development/compilers/openjdk/7.nix
pkgs/development/compilers/openjdk/8.nix
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
pkgs/development/compilers/zulu/default.nix
pkgs/development/haskell-modules/generic-builder.nix
pkgs/misc/misc.nix
pkgs/stdenv/generic/builder.sh
pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Guillaume Maudoux
868dd0f7c1
tup: 0.7.3 -> 0.7.5
2017-07-26 15:38:43 +02:00
Peter Simons
28c01703f0
haskell: remove all code related to the "haste" compiler
...
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Charles Strahan
4244a16917
gocode: update to f1eef9a6, fix stdlib completions
2017-07-26 02:30:15 -04:00
Graham Christensen
69c2c997e0
Merge pull request #27072 from ElvishJerricco/swig-3.0.12
...
Swig 3.0.10 -> 3.0.12
2017-07-25 22:57:28 -04:00
Daiderd Jordan
bbc5d15d0a
mypy: 0.501 -> 0.511
2017-07-25 21:52:54 -04:00
Peter Simons
ea63fd4eb0
multi-ghc-travis: update to latest git version
...
I used an incorrect date for the version field in my last commit, so now I have
to date this slightly into the future to make sure the new version actually
looks newer to Nix, too.
2017-07-25 18:53:03 +02:00
Martin Kreidenweis
a32441cb44
chromedriver: 2.29 -> 2.31
2017-07-25 17:37:28 +02:00
Bas van Dijk
662cf644bc
hydra: 2017-06-22 -> 2017-07-24
...
hydra-2017-06-22 fails to build because of the nixUnstable upgrade.
hydra-2017-07-24 builds successfully.
2017-07-24 23:22:08 +02:00
Eelco Dolstra
d65e528a37
Merge remote-tracking branch 'origin/master' into gcc-6
2017-07-24 18:27:24 +02:00
Eelco Dolstra
6669a3b477
stdenv: Remove log nesting
...
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
2017-07-24 14:30:46 +02:00
Eelco Dolstra
9f345ce2c7
gnumake41: Remove unused version
2017-07-24 14:27:12 +02:00
Eelco Dolstra
8cfe77444b
gnumake40: Remove unused version
2017-07-24 14:27:11 +02:00
Eelco Dolstra
969d7b0451
gnumake380: Remove
...
This hasn't been used in a long time.
2017-07-24 14:27:11 +02:00
Frederik Rietdijk
29f91c107f
Merge remote-tracking branch 'upstream/master' into HEAD
2017-07-23 11:23:43 +02:00
Thomas Tuegel
4f88ceff49
jam: unset AR
...
Commit 093cc00cdd
sets the AR environment variable
by default, but this causes the jam Makefile to use the wrong command.
2017-07-22 19:36:55 -05:00
Mathias Schreck
6589a83a88
sauce-connect: 4.4.7 -> 4.4.8
2017-07-22 12:41:47 +02:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv
2017-07-21 20:36:34 -05:00
Eelco Dolstra
a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6
2017-07-21 11:05:58 +02:00
Peter Simons
83fe3f0268
multi-ghc-travis: update to current Git master 800980d76f7a74f3
2017-07-20 09:15:47 +02:00
Jörg Thalheim
d36614cb28
flamegraph: 2017-05-11 -> 2017-07-01
2017-07-19 14:24:56 +01:00
Elijah Caine
1fef42dde9
container-linux-config-transpiler: init at 0.4.1 ( #27486 )
2017-07-19 08:30:51 +01:00
Daniel Peebles
bd2e91e3a2
Merge pull request #27318 from copumpkin/darwin-high-sierra
...
Support High Sierra on Darwin
2017-07-18 17:06:06 -04:00
Vincent Laporte
65b1613456
frama-c: 20161101 (Silicon) -> 20170501 (Phosphorus)
2017-07-18 20:30:53 +02:00
Benno Fünfstück
496dac571c
racer[d]: fix RUST_SRC_PATH
...
`rustc.src` is a `tar.gz` archive, but we need it unpacked.
2017-07-18 17:16:52 +02:00
Tuomas Tynkkynen
27e503f00c
strace: 4.17 -> 4.18
2017-07-18 13:41:07 +03:00
Frederik Rietdijk
f59e71e9c7
heroku: mark as broken
2017-07-18 08:43:38 +02:00
Dan Peebles
8253fc2ae5
pants: 1.2.1 -> 1.3.0
...
I'm also removing the pants13-pre attribute since it's unnecessary and I
don't want to maintain 1.4.x prereleases yet.
I'm temporarily taking out the pants native rust engine shenanigans until
I can get a nix-native rust build of it to work (it works on Linux but
not on Darwin!)
2017-07-17 10:37:52 -04:00
Vincent Laporte
b57bf746a1
ocaml-top: 1.1.3 -> 1.1.4
...
ocamlPackages.ocp-build: 1.99.18-beta -> 1.99.19-beta
2017-07-16 12:43:35 +02:00
Jörg Thalheim
f1b45f7d41
lttng-ust: add missing python dependency
2017-07-16 09:07:10 +01:00
Benno Fünfstück
dc696e2800
Merge pull request #26096 from ambrop72/teensy-fix
...
teensy-loader-cli: Update to latest git.
2017-07-15 20:22:34 +02:00
Peter Hoeg
18e2b44653
wp-cli: 1.2.0 -> 1.2.1
2017-07-13 00:22:08 +08:00
Dan Peebles
0419452113
Fix Darwin stdenv to work on 10.13
...
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
Vincent Laporte
412da3210b
ocamlPackages.oasis: remove 0.4.6
2017-07-11 02:46:32 +00:00
Vincent Laporte
3095a46bfc
ocamlPackages.oasis: 0.4.7 -> 0.4.10
2017-07-11 03:40:07 +02:00
Jörg Thalheim
14702c3944
Merge pull request #27240 from dtzWill/feature/moby-linuxkit
...
moby, linuxkit: init at 2017-07-07, 2017-07-08
2017-07-10 11:12:07 +01:00
Niklas Hambüchen
a37f3a3573
hotspot: init at 1.0.0
2017-07-09 22:30:41 +02:00
Peter Hoeg
f2be840e98
re2c: minor cleanup
2017-07-09 22:43:38 +08:00
Vladimír Čunát
3a891c67fc
re2c: fix sourceRoot in a more robust way
...
Reverting ee5a17514c
would also work.
The temporary confusion was due to #26877 changes.
2017-07-09 10:40:11 +02:00
Joachim F
c5fdfffa46
Merge pull request #27155 from bachp/gitlab-runner-1.11.5
...
gitlab-runner_1_11: 1.11.4 -> 1.11.5
2017-07-09 09:35:57 +01:00
Karn Kallio
ee5a17514c
re2c : Fix build by adjusting sourceRoot.
2017-07-09 07:36:51 +00:00
Will Dietz
ceff05aa4f
linuxkit: init at 2017-07-08
2017-07-08 09:25:01 -05:00
Will Dietz
0b6a504283
moby: init at 2017-07-06
2017-07-08 09:25:01 -05:00
Robin Raymond
4a3e1d83a1
godot 2.1.1-stable -> 2.1.3-stable
2017-07-08 14:48:35 +02:00
Vincent Laporte
676156a658
obuild: fix build
2017-07-08 12:22:55 +02:00
Vincent Laporte
cacc9faac7
camlPackages.camlp5: 6.17 -> 7.01
2017-07-08 06:14:43 +00:00
Tim Steinbach
1a7d9f573b
gradle: 4.0 -> 4.0.1
2017-07-07 19:52:57 -04:00
Frederik Rietdijk
ea5b2df865
Merge pull request #27094 from nand0p/buildbot-0.9.9
...
buildbot: 0.9.7 -> 0.9.9.post2
2017-07-07 17:48:29 +02:00
Jörg Thalheim
515d5d577b
Merge pull request #27177 from tw-360vier/git-ftp
...
git-ftp: init at 1.4.0
2017-07-07 15:45:08 +01:00
Fernando J Pando
f6a7b851d4
buildbot: 0.9.7 -> 0.9.9.post2
...
- adds grid-view plugin
- module fixup
- tested on nixos
2017-07-07 10:00:37 -04:00
Tim Steinbach
8ab9f99309
Merge pull request #27133 from NeQuissimus/ammonite_1_0_0
...
ammonite: 0.9.9 -> 1.0.0
2017-07-07 09:01:26 -04:00
Thorsten Weber
14f2083445
git-ftp: init at 1.4.0
2017-07-07 11:41:30 +02:00
Pascal Wittmann
1ce2ad7fd1
Merge pull request #27200 from Ralith/bindgen
...
rust-bindgen: 0.25.5 -> 0.26.1
2017-07-07 09:45:34 +02:00
Benjamin Saunders
75ca369355
rust-bindgen: 0.25.5 -> 0.26.1
2017-07-06 23:29:54 -07:00
Pascal Wittmann
bd3b58b197
Merge pull request #27015 from expipiplus1/qbs
...
qbs: init at 1.8
2017-07-06 10:21:52 +02:00
Joe Hermaszewski
6fd51f96fe
qbs: init at 1.8
2017-07-05 22:53:38 +01:00
Michael Raskin
8dee8d5f5c
Merge pull request #26584 from pjones/pjones/blackmagic
...
blackmagic init at 1.6.1
2017-07-05 23:35:16 +02:00
Vincent Laporte
2521af87ad
obuild: remove dependency on findlib
2017-07-05 18:05:09 +00:00
Volth
18e3799cd1
ocamlPackages.{benchmark,obuild,ptmap,rope}: init at 1.4, 0.1.8, 2.0.1, 0.5
2017-07-05 17:48:45 +00:00
Peter Jones
e33c7fa4c1
blackmagic init at 1.6.1
2017-07-05 08:45:40 -07:00
Pascal Bach
52ceb981a1
gitlab-runner_1_11: 1.11.4 -> 1.11.5
2017-07-05 17:31:11 +02:00
Vladimír Čunát
5328aac7be
Merge branch 'staging'
...
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Tim Steinbach
aebe8586bc
ammonite: 0.9.9 -> 1.0.0
2017-07-04 21:17:04 -04:00
Fatih Altinok
a0f3ce28eb
flow: 0.48.0 -> 0.49.1
2017-07-04 17:43:40 +02:00
Jörg Thalheim
277c1f8624
Merge pull request #27095 from dtzWill/feature/csmith
...
csmith: init at 2.3.0, pull in Sys::CPU as dependency.
2017-07-04 15:10:05 +01:00
Peter Simons
b9ed1177c8
haskell-tinc: enable Hydra builds
2017-07-04 15:50:26 +02:00
Peter Simons
b683a15d17
haskell-tinc: don't hard-code the version of GHC used by this tool
...
We don't want to re-compile tinc just to change the GHC environment used for
building, i.e. when running inside of nix-shell. Instead, find "ghc" in $PATH.
2017-07-04 15:50:26 +02:00
Peter Simons
cafed1a84c
haskell-tinc: update to latest git version to fix the build
2017-07-04 15:50:26 +02:00
Will Dietz
050ee80ddb
csmith: init at 2.3.0, pull in Sys::CPU as dependency.
2017-07-03 14:39:56 -05:00
Frederik Rietdijk
970c2cc35f
Merge pull request #27084 from lufia/update-gae-go
...
google-app-engine-go-sdk: 1.9.53 -> 1.9.55
2017-07-03 20:08:27 +02:00
dywedir
57f394572d
yarn: 0.24.6 -> 0.27.5
2017-07-03 18:42:45 +02:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging
2017-07-03 09:48:58 +02:00
lufia
5605f9d2c8
google-app-engine-go-sdk: 1.9.53 -> 1.9.55
2017-07-03 13:55:38 +09:00
Judson
728bb987ec
Adding docs for bundlerApp.
2017-07-02 17:55:41 -07:00