Commit Graph
238161 Commits
Author SHA1 Message Date
R. RyanTM d666802958 monolith: 2.2.7 -> 2.3.0 2020-07-16 08:02:10 +00:00
Oleksii Filonenko e2299f6ff3 Merge pull request #93206 from r-ryantm/auto-update/antibody
antibody: 6.0.1 -> 6.1.0
2020-07-16 10:52:59 +03:00
Stig Palmquist a05489fb90 perlPackages.WWWCurl: fix build
- Include patch from AUR to fix compatibility with newer libcurl.
- Fix build with clang
2020-07-16 09:35:58 +02:00
Daniël de Kok aa94e5f2c2 Merge pull request #93210 from zowoq/podman
podman updates
2020-07-16 09:20:01 +02:00
Daniël de Kok 8775590c7e Merge pull request #93213 from zowoq/go-1-13
go_1_13: 1.13.12 -> 1.13.13
2020-07-16 09:17:23 +02:00
Sarah Brofeldt 45f4bdec2e Merge pull request #93228 from srhb/kubernetes-fixup-test
nixos/tests/kubernetes: Don't re-import <nixpkgs>
2020-07-16 09:17:06 +02:00
Sarah Brofeldt 07f38f7f4b Merge pull request #93223 from srhb/k8s-1.18.6
kubernetes: 1.18.5 -> 1.18.6
2020-07-16 09:16:26 +02:00
zowoq fa18e11f42 wireshark: 3.2.4 -> 3.2.5 2020-07-16 08:49:22 +02:00
R. RyanTM a16038b3bd libcrafter: 0.3 -> 1.0 2020-07-16 06:47:54 +00:00
Sarah Brofeldt 7ab42c176c nixos/tests/kubernetes: Don't re-import <nixpkgs> 2020-07-16 08:44:04 +02:00
Sarah Brofeldt 366cef3611 kubernetes: 1.18.5 -> 1.18.6 2020-07-16 08:19:09 +02:00
R. RyanTM 2d5f459258 k6: 0.26.2 -> 0.27.0 2020-07-16 06:17:40 +00:00
Justin Gerhardt 2370ca0b26 stm32cubemx: 5.3.0 -> 5.6.1 2020-07-16 01:54:41 -04:00
Jan Tojnar 11ae0fb1ad Merge pull request #93041 from jtojnar/flatpak-builder-1.0.11
flatpak-builder: 1.0.10 → 1.0.11
2020-07-16 07:15:56 +02:00
R. RyanTM 1e816defe7 fly: 6.3.0 -> 6.4.0 2020-07-16 04:42:06 +00:00
R. RyanTM ab0171b08d fluent-bit: 1.4.6 -> 1.5.0 2020-07-16 04:37:54 +00:00
Ryan Mulligan 891e3cb973 Merge pull request #92575 from r-ryantm/auto-update/seaview
seaview: 5.0.2 -> 5.0.4
2020-07-15 21:23:13 -07:00
zowoq 9198310fc6 kepubify: 3.1.3 -> 3.1.4 2020-07-16 14:12:00 +10:00
Dmitry Kalinkin a598665c4c motion: add meta.platforms 2020-07-15 23:48:07 -04:00
Dmitry Kalinkin f84294c787 motion: switch ffmpeg_3 to ffmpeg 2020-07-15 23:47:54 -04:00
Dmitry Kalinkin 7dd1a199db motion: 4.3.0 -> 4.3.1 2020-07-15 23:47:20 -04:00
zowoq ea3d6dddd8 go_1_13: 1.13.12 -> 1.13.13 2020-07-16 13:00:58 +10:00
Jan Tojnar d49b38b73c Merge pull request #92715 from jtojnar/fix-libinput-commands 2020-07-16 04:58:38 +02:00
zowoq 3bfa73bbe8 go_1_15: go: only set CC when cross-compiling
81a8b76b3a
2020-07-16 12:50:33 +10:00
Jan Tojnar 812d124fbc Revert "darktable: Remove $out/share/doc"
This reverts commit 5d7cbc659e.
2020-07-16 04:38:08 +02:00
Jan Tojnar 2596c96f87 Revert "transmission: Remove $out/share/doc"
This reverts commit 25bc56fcb8.
2020-07-16 04:38:08 +02:00
Jan Tojnar 75fdc1ced6 cmake.setupHook: define shareDocName
The docdir flag needs to include `PROJECT_NAME` according to [GNU guidelines]. We are passing
`-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}` but `$shareDocName` was unset.

The `multiple-outputs.sh` setup hook actually only defines `shareDocName` as a local variable
so it was not available for cmake setup hook. Making it global would be of limited usability,
since it primarily tries to extract the project name from configure script.
Additionally, it would not be set because the setup hook defines `setOutputFlags=`,
preventing the function defining `shareDocName` from running. And lastly, the function
would not run for single-output derivations.

Previously, we tried [not disabling `setOutputFlags`] and passing the directory flags
only for multi-output derivations that do not disable `setOutputFlags` but that meant having
two different branches of code, making it harder to check correctness. The multi-output
one did in fact not work due to aforementioned undefined `shareDocName`. It also broke
derivations that set `setOutputFlags=` like [`qtModule` function does] (probably
because some Qt modules have configure scripts incompatible with `configureFlags` defined
by `multiple-outputs.sh` setup hook). For that reason, it was [reverted], putting us back to start.

Let’s try to extract the project name from CMake in the cmake setup hook.

CMake has a `-L` flag for dumping variables but `PROJECT_NAME` did not seem to be among them
when I tested, so I had to resort to parsing the `CMakeLists.txt` file.

The extraction function is limited, it does not deal with

* project name on different line from the `project(` command opening
    - that will just not get matched so we will fall back to
      using the derivation name
* variable interpolation
    - we will just fall back to using derivation name when the extracted
      `project_name` contains a dollar character
* multiple [`project`] commands
    - The command sets `PROJECT_NAME` variable anew with each call, so the
      last `project` call before `include(GNUInstallDirs)` command will be used
      when the included module would [cache the `CMAKE_INSTALL_DOCDIR` variable].
      We will just take the first discovered `project` command for simplicity.
      Hopefully, there are not many projects that use multiple `project` calls
      before including `GNUInstallDirs`.

In either case, we will have some subdirectory so the conflicts will be minimized.

[GNU guidelines]: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html#index-docdir
[not disabling `setOutputFlags`]: https://github.com/NixOS/nixpkgs/commit/be1b22538a60e52987d238bb11f93043682b6e9a
[`qtModule` function  does]: https://github.com/NixOS/nixpkgs/pull/12740
[reverted]: https://github.com/NixOS/nixpkgs/pull/92298
[`PROJECT_NAME`]: https://cmake.org/cmake/help/v3.18/variable/PROJECT_NAME.html
[`project`]: https://cmake.org/cmake/help/v3.18/command/project.html
[cache the `CMAKE_INSTALL_DOCDIR` variable]: https://github.com/Kitware/CMake/blob/92e30d576d66ac05254bba0f0ff7d655947beb0f/Modules/GNUInstallDirs.cmake#L298-L299
2020-07-16 04:38:07 +02:00
R. RyanTM 466562c3e0 cargo-expand: 0.6.0 -> 0.6.4 2020-07-16 02:38:04 +00:00
Dmitry Kalinkin 166a71a6ae arrow-cpp: fix eval, enable linking against zstd_shared
This is a second part for #93203.
2020-07-15 22:36:07 -04:00
Dmitry Kalinkin 9173beb67d Merge branch 'staging-next' into staging 2020-07-15 22:28:18 -04:00
Patrick Gaskin 752ea30951 kepubify: Update my GitHub username 2020-07-16 12:26:11 +10:00
Dmitry Kalinkin e8cf168c80 Merge branch 'master' into staging-next 2020-07-15 22:23:51 -04:00
zowoq db5bf52c7c podman: update repo 2020-07-16 12:21:46 +10:00
zowoq 3f322a8732 crun: 0.14 -> 0.14.1 2020-07-16 12:18:25 +10:00
Dmitry Kalinkin 992db90c4c Merge pull request #93203 from veprbl/pr/arrow-cpp_zstd_link_static
arrow-cpp: fix darwin build by linking against libzstd_static
2020-07-15 22:15:43 -04:00
zowoq 34ee9bfe7c conmon: 2.0.18 -> 2.0.19 2020-07-16 12:12:34 +10:00
zowoq 1b84dbfdd9 slirp4netns: 1.1.2 -> 1.1.4 2020-07-16 12:12:19 +10:00
Dmitry Kalinkin c184c87571 pythonPackages.numexpr: fix darwin build by refactoring checkPhase
This fixes a following error on python 3.8:

FileNotFoundError: [Errno 2] No such file or directory: '/nix/store/0s7kw66pav5c7bi38lb0gznxnxz31a1n-python3.8-numexpr-2.7.1/<stdin>'
2020-07-15 22:11:43 -04:00
zowoq 805f7676bc Revert "nixos/podman: use cgroupfs for rootless crun test"
This reverts commit 033ba9c73d.
2020-07-16 12:11:09 +10:00
R. RyanTM 4484ee57f9 bdf2sfd: 1.1.2 -> 1.1.3 2020-07-16 01:47:17 +00:00
Mario Rodas 178de8429d Merge pull request #92802 from misuzu/rednose-macos
pythonPackages.rednose: fix build on macOS
2020-07-15 20:24:47 -05:00
R. RyanTM bc241042f9 python27Packages.kazoo: 2.7.0 -> 2.8.0 2020-07-15 18:13:39 -07:00
R. RyanTM 8fb0db8474 python27Packages.pytelegrambotapi: 3.7.1 -> 3.7.2 2020-07-15 18:13:00 -07:00
Cassidy Dingenskirchen 6d44f37c94 pythonPackages.discordpy: 1.3.3 -> 1.3.4 2020-07-15 18:12:43 -07:00
R. RyanTM f16d6a7304 antibody: 6.0.1 -> 6.1.0 2020-07-16 01:11:42 +00:00
Daniël de Kok 777bcfd337 python3Packages.spacy: 2.3.1 -> 2.3.2
Changelog:

https://github.com/explosion/spaCy/releases/tag/v2.3.2
2020-07-15 18:10:31 -07:00
R. RyanTM a466225b57 python27Packages.wurlitzer: 2.0.0 -> 2.0.1 2020-07-15 18:05:57 -07:00
R. RyanTM 285a93d89b python37Packages.python3-openid: 3.1.0 -> 3.2.0 2020-07-15 18:04:11 -07:00
R. RyanTM 3f909b6a17 python27Packages.uamqp: 1.2.8 -> 1.2.9 2020-07-15 18:02:10 -07:00
Lancelot SIX 9db754433c pythonPackages.django: 2.2.13 -> 2.2.14
See https://docs.djangoproject.com/en/2.2/releases/2.2.14/ for release
information
2020-07-15 17:46:21 -07:00