3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1329 commits

Author SHA1 Message Date
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Daiderd Jordan cb8e6f73f5
cmake: add cf-private on darwin 2019-02-24 11:32:47 +01:00
Daiderd Jordan c8aaadcc9d
cmake: disable ApplicationServices and CoreServices on darwin 2019-02-24 11:30:48 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Dmitry Kalinkin f96d4d555b
Merge pull request #55998 from ThomasMader/dlang-update
Dlang update
2019-02-22 02:29:41 -05:00
Vladimír Čunát 052e34a66f
Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging) 2019-02-22 07:23:08 +01:00
Thomas Mader 0e88d17fb1 dub: Disable network tests because they add impurities 2019-02-22 07:22:11 +01:00
Frederik Rietdijk 5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Matthew Bauer ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross
cmake: add ability to cross-compile cmake
2019-02-19 22:34:15 -05:00
Sam Stites 9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Michael Eden cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Carlos Morera de la Chica 9c406336f1 bazel: fix bash completion 2019-02-18 11:34:35 +01:00
Ryan Mulligan 0a0f0b355b
Merge pull request #55714 from mpisanko/leiningen-2.9.0
upgrade leiningen to latest (2.9.0)
2019-02-17 14:20:26 -08:00
Michal Pisanko e53ea1fb01 leiningen: 2.8.3 -> 2.9.0 2019-02-18 08:12:39 +11:00
Ryan Mulligan a954ca52e5
Merge pull request #55035 from uri-canva/bazel-deps
bazel-deps: 2018-11-01 -> 2019-02-01
2019-02-17 06:49:31 -08:00
Frederik Rietdijk 9dc262c659 pants: mark as broken 2019-02-17 14:40:55 +01:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
R. RyanTM 7c860b5fd8 conan: 1.11.2 -> 1.12.0 (#55335)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conan/versions
2019-02-14 21:53:05 +01:00
Will Dietz 0f14c9cd8f ninja: patch to fix w/musl, see upstream issue 2019-02-11 22:41:45 -06:00
Vladimír Čunát c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Silvan Mosberger 18d059a4ac
Merge pull request #54115 from k32/master
rebar3: 3.6.1 -> 3.9.0
2019-02-09 17:29:59 +01:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
worldofpeace 3abe344987
ninja: Add comment explaining the consistent ID patch
Co-Authored-By: grahamc <graham@grahamc.com>
2019-02-07 18:26:51 -05:00
Graham Christensen 21cdf28a83
ninja: make reproducible
See https://github.com/ninja-build/ninja/pull/1529
2019-02-07 18:04:59 -05:00
k32 d4b243905f rebar3: 3.6.1 -> 3.9.0
Remove hermetic patch (make it compatible with the upstream)
(Mostly) eliminate the need for hex package registry
2019-02-06 19:45:40 +01:00
Tim Steinbach c7fda39fc2
sbt-extras: 2018-12-04 -> 2019-01-30 2019-02-06 08:53:41 -05:00
Franz Pletz 97507ffc8b
Merge pull request #55046 from FlorianFranzen/cmake_no_pkg_reg
cmake: disable package registry
2019-02-03 08:32:43 +00:00
Vladimír Čunát bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Vladyslav M c7e1e48657
Merge pull request #54773 from r-ryantm/auto-update/mill
mill: 0.3.5 -> 0.3.6
2019-02-02 12:32:14 +02:00
Will Dietz b6e50b3a3c
Merge pull request #55008 from dtzWill/update/ninja-1.9.0
ninja: 1.8.2 -> 1.9.0
2019-02-02 00:58:59 -06:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Uri Baghin 2b2854e522 bazel-deps: 2018-11-01 -> 2019-02-01 2019-02-01 17:30:36 +11:00
Will Dietz d4cd52e503 ninja: 1.8.2 -> 1.9.0
https://groups.google.com/forum/#!topic/ninja-build/nY5Kb7zUvcg
2019-01-31 12:25:13 -06:00
Florian Franzen e0e4577c0f cmake: disable package registry 2019-01-31 10:17:55 +01:00
Kévin Rauscher e925ec27ba bloop: 1.2.3 -> 1.2.5 (#54427) 2019-01-31 01:20:55 +02:00
Félix Baylac-Jacqué a5aca72f93 bazel: 0.21.0 -> 0.22.0 2019-01-30 14:57:32 +01:00
Philip Patsch 5c6892e1a2 bazel: fix java toolchain regression
By changing the default toolchain to JDK8, we broke the default Java
toolchain, which assumes JDK9.

Instead, set `host_java_toolchain` manually for our build of bazel,
and set `java_toolchain` to run the java tests with the build JDK as
well.

Fixes https://github.com/NixOS/nixpkgs/issues/54289
2019-01-29 14:03:54 +01:00
R. RyanTM 0f490eab3e mill: 0.3.5 -> 0.3.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
2019-01-28 01:04:08 -08:00
Will Dietz 5aaf597df3 meson: 0.49.0 -> 0.49.1
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
2019-01-27 15:28:01 -06:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Robin Palotai 566539ff55 Add test and docs. 2019-01-26 22:22:34 +01:00
Robin Palotai d3199ddaa7 Add gzip and gnutar to default bazel-bash tools. These are often used by rules, mostly due to Bazel's one-output rule. 2019-01-26 22:22:34 +01:00
Michael Weiss f561acc48e
scons.src: Update the hash (tarball was modified)
Unfortunately the tarball was modified for the official release and
"nix-store -r --check $(nix-instantiate -A scons.src)" did not catch
this (not sure why ATM).

Thanks @pbogdan for noticing this :)
2019-01-23 21:21:46 +01:00
Michael Weiss c2b8270fb8
Merge pull request #54461 from primeos/scons
scons: 3.0.3 -> 3.0.4
2019-01-23 19:05:44 +01:00