Commit Graph

1372 Commits

Author SHA1 Message Date
Matthew Bauer
84d00355e8 Merge remote-tracking branch 'NixOS/master' into staging 2019-04-23 22:00:42 -04:00
Mario Rodas
9c4d8bcee7
doit: fix darwin build 2019-04-23 04:21:00 -05:00
Graham Christensen
8803fb8918
waf: make reproducible 2019-04-22 11:08:15 -04:00
Frederik Rietdijk
bae32a9f5c Merge staging-next into staging 2019-04-16 18:54:15 +02:00
R. RyanTM
b76226f8d7 maven: 3.6.0 -> 3.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions
2019-04-16 18:48:18 +02:00
Matthew Bauer
f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
Dmitry Kalinkin
aa111a2b7e
Merge pull request #59197 from ThomasMader/dlang-update
Dlang update (ldc: 1.14.0 -> 1.15.0, dmd: 2.084.1 -> 2.085.1, dtools: 2.084.1 -> 2.085.1, dub: 1.13.0 -> 1.14.0)
2019-04-13 19:51:16 -04:00
Dmitry Kalinkin
59c81160e7
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
2019-04-13 12:04:32 -04:00
Thomas Mader
dceae4927c dub: 1.13.0 -> 1.14.0 2019-04-11 23:03:18 +02:00
Mario Rodas
bcfc8ce784
buck: 2017.10.01.01 -> 2019.01.10.01 2019-04-11 08:10:00 -05:00
Robert Schütz
2d29d97838
Merge pull request #57688 from dotlambda/pyyaml-5.1
python.pkgs.pyyaml: 3.13 -> 5.1
2019-04-10 10:53:14 +02:00
Matthew Bauer
a79a8f29bc waf: use wafConfigureFlags for waf flags
This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.
2019-04-09 23:44:37 -04:00
Frederik Rietdijk
d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
R. RyanTM
8cf2baa408 rebar3: 3.9.0 -> 3.9.1 (#58864)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rebar3/versions
2019-04-07 16:30:40 +02:00
Vladimír Čunát
526c4292ae
Merge branch 'staging-next'
This iteration was long, about five weeks (2fcb11a2), I think.
Darwin: it's missing a few thousand binaries and there's a make-netbsd
regression, but I suppose these aren't merge blockers.
2019-04-06 13:20:53 +02:00
Jan Tojnar
103bf0cf1d
meson: 0.49.1 → 0.49.2 2019-04-05 12:13:58 +02:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
Robert Schütz
f328510af6 conan: pin pyyaml to 3.13
Upstream requires
    PyYAML>=3.11, <3.14.0
2019-04-03 16:25:02 +02:00
Robert Schütz
244fcfc85c conan: pin pluginbase to 0.7
Upstream requires
    pluginbase>=0.5, < 1.0
2019-04-03 16:15:23 +02:00
Vladimír Čunát
2771375d6e
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1512490
2019-04-02 20:56:53 +02:00
Daiderd Jordan
2e2ab461b7
Merge pull request #58147 from groodt/greg/bazel-0.23.2
bazel: 0.22.0 -> 0.24.0
2019-04-02 08:38:39 +02:00
Greg Roodt
92e5745383 gradle: 5.0 -> 5.3.1 (#58528) 2019-04-01 20:59:17 +02:00
Greg Roodt
d019fd8c8a bazel: 0.22.0 -> 0.24.0 2019-03-31 13:46:53 +11:00
Silvan Mosberger
555734eded bazel: Fix PATH escaping 2019-03-29 20:31:04 +01:00
Symphorien Gibol
3d60a00c63 wafHook: cross compilation support
for this to work, wafHook must be in nativeBuildInputs.
2019-03-28 20:06:25 +01:00
Symphorien Gibol
1001d0034c wafHook: ignore configurePlatforms
waf does support --build and --host, but the only effect of these
options is an error message telling to use --cross-compile instead.
So we ignore these flags.
2019-03-28 19:59:16 +01:00
Symphorien Gibol
f23a21514c wafHook: ignore --disable-static and such options
These options are forcefully added by pkgsStatic but are not understood
by waf.
2019-03-28 18:33:08 +01:00
Symphorien Gibol
f075de5c25 wafHook: let derivations use an existing waf in a non-standard location
this is necessary for talloc
2019-03-28 18:32:29 +01:00
Michael Weiss
8939a5da89
scons: 3.0.4 -> 3.0.5
Announcement:
https://scons.org/scons-305-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.5/src/CHANGES.txt
2019-03-27 11:12:30 +01:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Vladimír Čunát
04066403ae
Merge branch 'master' into staging-next
Lots of rebuilds from master, apparently.
Hydra nixpkgs: ?compare=1509577
2019-03-14 19:54:49 +01:00
Matthew Bauer
37eba81c7b
Merge pull request #56391 from matthewbauer/cmake-treewide
Add more CMake flags
2019-03-11 12:43:46 -04:00
Uri Baghin
130d987ab1 bazel-remote: init at 2019-01-12 2019-03-11 11:10:59 +01:00
Vladimír Čunát
bf47162c26
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
2019-03-10 08:04:21 +01:00
Matthew Bauer
91f0c848f4 cmake: set BUILD_TESTING=OFF when doCheck is false
This means we can avoid building test suites that will never be run.
2019-03-09 14:32:55 -05:00
Aaron Bull Schaefer
1b3b781d60 bazel-buildtools: unstable -> 0.22.0 2019-03-07 20:37:23 -08:00
Frederik Rietdijk
35e73c9dd5 Merge staging into staging-next 2019-03-03 09:35:42 +01:00
Herwig Hochleitner
025c2abd08 leiningen: 2.9.0 -> 2.9.1
(cherry picked from commit 80021b41e74ac9a3b63ac5b27ddc16f785a5b7f1)
2019-03-02 06:37:52 +01:00
Frederik Rietdijk
205e0fc5bd Merge staging-next into staging 2019-03-01 09:22:21 +01:00
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
Vladimír Čunát
c010fc9222
Merge branch 'staging-next' into staging 2019-02-26 09:30:26 +01:00
Matthew Bauer
73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05: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
Benjamin Hipple
9953a68c80 waf: 2.0.13 -> 2.0.14 2019-02-24 10:28:36 +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