Commit graph

2274 commits

Author SHA1 Message Date
github-actions[bot] 5a31e44bd3
Merge staging-next into staging 2021-07-04 12:01:40 +00:00
Robert Schütz a5de6179cb
Merge pull request #129137 from bjornfor/fix-conan
conan: fix build after python3Packages updates
2021-07-04 13:12:03 +02:00
github-actions[bot] c852543c1f
Merge staging-next into staging 2021-07-04 06:01:43 +00:00
Sandro 8723bd8119
Merge pull request #129122 from dotlambda/dateutil-alias 2021-07-04 02:53:34 +02:00
Bjørn Forsman 9b16b5e381 conan: fix build after python3Packages updates
conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides
results in this build error:

  $ nix-build -A conan
  ...
  Found duplicated packages in closure for dependency 'six':
    six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages)
    six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages)

As the changes in six-1.16.0 look harmless, work around the above issue
by allowing conan to use six-1.16.0.
2021-07-03 20:45:13 +02:00
github-actions[bot] 0957b61eaa
Merge staging-next into staging 2021-07-03 18:01:40 +00:00
Jörg Thalheim 65f0732422
Merge pull request #128988 from KireinaHoro/master
mill: 0.9.6 -> 0.9.8
2021-07-03 13:48:29 +01:00
github-actions[bot] eaa5839643
Merge staging-next into staging 2021-07-03 12:01:53 +00:00
Robert Schütz 1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Daniël de Kok 017aa88470 Remove danieldk as a maintainer for some packages
- AMD GPU packages: AMD removed support for the RX5x0 GPUs from ROCm, so
  I cannot test these packages anymore.
- A small number of GUI packages: I switched back to macOS on the
  desktop for work reasons, so I cannot easily test these.
- broot: I took over maintainership from someone else, but do not really
  use broot.
2021-07-03 12:14:20 +02:00
KireinaHoro 330f8a1629 mill: 0.9.6 -> 0.9.8 2021-07-02 19:56:39 +08:00
github-actions[bot] ff0a0c28da
Merge staging-next into staging 2021-06-29 00:10:57 +00:00
Ryan Mulligan e87001bbc0
Merge pull request #128321 from r-ryantm/auto-update/bear
bear: 3.0.12 -> 3.0.13
2021-06-28 12:38:44 -07:00
github-actions[bot] 1bce4703aa
Merge staging-next into staging 2021-06-28 18:12:05 +00:00
Jörg Thalheim 41902c2f7d
Merge pull request #120501 from Mic92/gnumake
gnumake: use sh instead of /bin/sh by default
2021-06-28 07:19:00 +01:00
R. RyanTM ada25b1a98 bear: 3.0.12 -> 3.0.13 2021-06-27 14:52:45 +00:00
R. RyanTM db961ec5bc bazel-remote: 2.1.0 -> 2.1.1 2021-06-24 05:12:00 +00:00
Sandro 3d544b4d5b
Merge pull request #127713 from musfay/qbs-1.19.1
qbs: 1.18.0 -> 1.19.1
2021-06-22 15:08:34 +02:00
Mustafa Çalışkan 5beb11788a qbs: 1.18.0 -> 1.19.1 2021-06-21 21:58:25 +03:00
R. RyanTM 818201e4b5 bazel-remote: 2.0.1 -> 2.1.0 2021-06-17 17:21:34 +02:00
Sandro df4ffccc5c
Merge pull request #126863 from alyssais/bear
bear: 3.0.9 -> 3.0.12
2021-06-16 03:33:22 +02:00
Sandro f7521e2abd
Merge pull request #126059 from timbertson/gup
gup: 0.7.0 -> 0.8.0
2021-06-15 16:50:11 +02:00
JesusMtnez 43d1855378
sbt: 1.5.3 -> 1.5.4 2021-06-15 06:12:50 +02:00
Alyssa Ross 5d08999385
bear: 3.0.9 -> 3.0.12
Fixes: https://github.com/NixOS/nixpkgs/pull/117413
2021-06-14 18:12:02 +00:00
Tim Cuthbertson 9012ed2a80
reuse version variable
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-11 21:49:20 +10:00
Alyssa Ross 4de8cbfb16 bmake.passthru.setupHook: set some defaults
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>).  Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.

Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
Sandro 26923b2f5c
Merge pull request #125337 from wentasah/cmake-more-docs 2021-06-09 14:32:22 +02:00
David 00ee61b3cc rebar3: add checkPhase 2021-06-09 12:14:12 +09:00
David ae2f75ef89 rebar3WithPlugins: add ability to ignore dependencies 2021-06-09 12:14:12 +09:00
Timothy Klim 8582f4cd83 sbt: 1.5.1 -> 1.5.3 2021-06-08 14:13:31 -04:00
Tim Cuthbertson e3cf1c63ef gup: 0.7.0 -> 0.8.0 2021-06-07 22:03:08 +10:00
Michal Sojka 498b5e578a cmake: Add man and info outputs
By default, the cmake derivation contains the documentation in .rst
format. This format is not well suited for interactive use. Therefore,
we add both man and info outputs and convert the documentation to
these formats using Sphinx.

These formats are enabled by default only in cmake versions for
interactive use (ncurses, Qt), because using Sphinx in the basic
version leads to circular dependency (infinite recursion). Namely,
Sphinx has imagemagick in its checkInputs and imagemagick has several
transitive dependencies, which have cmake in nativeBuildInputs.
2021-06-06 21:49:41 +02:00
Sandro 3bb27749ab
Merge pull request #123895 from dmivankov/bazel_4.1.0 2021-06-01 17:59:08 +02:00
Jörg Thalheim 4542b54abd
Merge pull request #125071 from sternenseemann/bmake
bmake: 20200902 -> 20210420
2021-06-01 08:11:16 +02:00
sternenseemann 10f8f08267 bmake: 20200902 -> 20210420
* Fix varmod-localtime test by setting TZ to an absolute path to the
  appropriate file in TZDIR. This avoids having an extra patch for musl
  which doesn't support TZDIR at all.
* Move tests into checkPhase by applying patch from alpine
* Fix build with musl by disabling deptgt-delete_on_error test (which I
  haven't debugged myself, just copied this from alpine) and fixing a
  test which fails due to differing output from strerror(3) between musl
  and glibc. Also we need to add a shebang to install-sh, otherwise it
  won't be executed in pkgsMusl.
2021-05-31 13:39:35 +02:00
Michael Weiss 3f3f5a0d5d
scons: Remove myself as maintainer
I'm not using it anymore but it would be great if we could find a new
maintainer as SCons is a build tool on which a few other packages
depend.
2021-05-30 15:22:55 +02:00
Andrew Childs 976ee287c8 bmake: fix build on darwin 2021-05-29 01:12:23 +02:00
David d706be982a rebar3: 3.16.0 -> 3.16.1 2021-05-24 15:33:02 -05:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Vladimír Čunát 7f651d15e2
Merge #122696: cmakeWithQt4Gui: drop 2021-05-22 16:10:27 +02:00
Dmitry Ivankov a15204fcc0 bazel_4: 4.0.0 -> 4.1.0
https://github.com/bazelbuild/bazel/releases/tag/4.1.0

other minor changes:
- grep for /bin/ rather than /bin for blanket substitute
- invoke {pre,post}{Build,Install} hooks
2021-05-22 09:51:22 +02:00
github-actions[bot] 901fb5e64e
Merge master into staging-next 2021-05-22 00:56:03 +00:00
David 454255ee58 rebar3: 3.15.1 -> 3.16.0 2021-05-22 06:19:50 +09:00
github-actions[bot] 929b12e7b5
Merge master into staging-next 2021-05-21 12:28:43 +00:00
David ac9b645021 rebar3: apply erlang/rebar3#2552 as patch 2021-05-21 17:24:45 +09:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Sandro a5a8ef13d3
Merge pull request #123157 from ehmry/tup
tup: 0.7.10 -> 0.7.11
2021-05-18 03:10:09 +02:00
Uri Baghin a975c80f91 bazel-remote: 1.0.0 -> 2.0.1 2021-05-17 23:21:53 +02:00
David aef59d8856 buildRebar3: use rebar3 bare compile 2021-05-18 05:40:58 +09:00
Sandro ca604582a1
Merge pull request #122960 from yogsototh/lein-2.9.6
leiningen: 2.9.5 -> 2.9.6
2021-05-17 19:03:30 +02:00