Commit Graph

1388 Commits

Author SHA1 Message Date
Frederik Rietdijk
193b899af2 Merge master into staging-next 2019-05-04 17:34:04 +02:00
Alyssa Ross
bf72529e36
Merge pull request #60507 from manveru/update-drake
drake: use bundlerApp
2019-05-04 13:19:12 +00:00
Alyssa Ross
182a621ba6
Merge pull request #60512 from manveru/rake-update
rake: 12.3.1 -> 12.3.2, use bundlerApp
2019-05-04 13:17:21 +00:00
Frederik Rietdijk
0f10b72b5f Merge master into staging-next 2019-05-03 19:56:31 +02:00
Renaud
2a3ce66ae8
Merge pull request #60755 from r-ryantm/auto-update/qbs
qbs: 1.12.2 -> 1.13.0
2019-05-03 19:26:45 +02:00
R. RyanTM
942a86de9f qbs: 1.12.2 -> 1.13.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbs/versions
2019-05-02 05:18:50 -07:00
Frederik Rietdijk
155c9d8e18 Merge master into staging-next 2019-05-02 08:43:14 +02:00
Mario Rodas
b34a9064b7
buck: fix build 2019-05-01 01:13:47 -05:00
Michael Fellinger
ceffda781f rake: 12.3.1 -> 12.3.2, use bundlerApp 2019-04-30 18:04:35 +02:00
Michael Fellinger
90ec6a32ba drake: use bundlerApp 2019-04-30 17:50:25 +02:00
Frederik Rietdijk
883232c00d Merge master into staging-next 2019-04-27 07:01:38 +02:00
Matthew Bauer
87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer
b1de8cf480 treewide: disable tests on darwin
- tthsum
- python-papis
- python-sqlalchemy-migrate
- python-xlib
- dub
2019-04-26 21:55:05 -04:00
Matthew Bauer
eaadbdf1c3 cmake: don’t use cf-private
cf-private is not necessary here. cmake just needs the CoreFoundation
framework to be used. swift-corefoundation seems to work fine in this case.

/cc @lnl7
2019-04-26 21:54:49 -04:00
Jan Tojnar
89a150355b
Merge branch 'master' into staging 2019-04-26 16:35:54 +02:00
Tim Steinbach
5d2775156b
sbt-extras: 2019-01-30 -> 2019-04-05 2019-04-25 08:05:07 -04:00
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