When dontUseCmakeBuildDir is true (aka the default), it overrides
cmakeDir regardless of the package configuration.
While packaging netbee, I needed to both keep dontUseCmakeBuildDir to
true (some hardcoded paths expect the build folder) and set cmakeDir
(since CMakeList.txt was in a subfolder) which proved impossible.
Here is the fix.
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:
$ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'
See issue #41007.
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)
Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:
- bintools-wrapper and cc-wrapper
On GNU/Linux the build references these files, so let's fetch them from
the Chromium repository. I haven't checked whether they are heavily
patched or whether we can use the version from LLVM, but when looking at
the changes, they do seem to divert a bit from upstream LLVM.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
The tarball from upstream seems to be generated on the fly, so the
output is not deterministic and using fetchzip makes this more reliable
as we have a recursively hashed output path without any of the
non-determinisms in tarballs.
Unfortunately, the build still fails on NixOS systems, because we need a
few more stuff in the build tree.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
This has already been patched against gnumake4 (519f0b8db2)
but we still have packages depending on gnumake3, so let's also apply
the same patch to gnumake 3.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @shlevy, @vcunat
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/doit/versions.
These checks were done:
- built on NixOS
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped --help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/.doit-wrapped --version` and found version 0.31.1
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit --help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit help` got 0 exit code
- ran `/nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1/bin/doit --version` and found version 0.31.1
- found 0.31.1 with grep in /nix/store/xgn48w19lgr8xnijgqcx91389b5hldv2-doit-0.31.1
- directory tree listing: https://gist.github.com/a0ba66d49e0c01c3003ca50e9ad705a0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.6 with grep in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
- found 2.0.6 in filename of file in /nix/store/5rgayqfl64bn9pyrfsc9kcm2c4vdqybi-waf-2.0.6
Upstream insists on not allowing bindir and other dir options
outside of prefix for some reason:
https://github.com/mesonbuild/meson/issues/2561
We remove the check so multiple outputs can work sanely.
In common distributions, RPATH is only needed for internal libraries so
meson removes everything else. With Nix, the locations of libraries
are not as predictable, therefore we need to keep them in the RPATH. [1]
Previously we have just kept the RPATH produced by the linker, patching
meson not to remove it. This deprived us of potentially replacing it
with install_rpath provided by project so we had to re-add it manually,
and also introduced a vulnerability of keeping build paths in RPATH.
This commit restores the clean-up but modifies it so the items starting
with /nix/store are retained.
This should be relatively safe since the store is immutable, however,
there might be some unwanted retainment of build_rpath [2] if it contains
paths from Nix store.
[1]: https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
[2]: http://mesonbuild.com/Release-notes-for-0-42-0.html#added-build_rpath-keyword-argument
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.10.2 with grep in /nix/store/ymhiik4c7604dxzlnvrrzj88d2lkcy16-ant-1.10.2
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --help` got 0 exit code
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --version` and found version 1.1.0
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --help` got 0 exit code
- ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --version` and found version 1.1.0
- found 1.1.0 with grep in /nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --help` got 0 exit code
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --version` and found version 1.1.0
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --help` got 0 exit code
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --version` and found version 1.1.0
- found 1.1.0 with grep in /nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):
pkgs/development/libraries/epoxy/default.nix
pkgs/development/libraries/gtk+/3.x.nix
pkgs/development/python-modules/asgiref/default.nix
pkgs/development/python-modules/daphne/default.nix
pkgs/os-specific/linux/systemd/default.nix
Semi-automatic update. These checks were done:
- built on NixOS
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-dot help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifchange help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ifcreate --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-ood help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-sources help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/redo-targets help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-dot-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifchange-wrapped help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -V` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -v` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --version` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped -h` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-ifcreate-wrapped --help` and found version 2.0.3
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-sources-wrapped help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped -h` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped --help` got 0 exit code
- ran `/nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3/bin/.redo-targets-wrapped help` got 0 exit code
- found 2.0.3 with grep in /nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3
- found 2.0.3 in filename of file in /nix/store/2fsvjrj28vrwn7jymslg7ykmdi03p97z-redo-sh-2.0.3
Semi-automatic update. These checks were done:
- built on NixOS
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --version` and found version 0.31.0
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --version` and found version 0.31.0
- found 0.31.0 with grep in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
- found 0.31.0 in filename of file in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
Semi-automatic update. These checks were performed:
- built on NixOS
- found 2.0.4 with grep in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4
- found 2.0.4 in filename of file in /nix/store/dr6xvrw483jr5vgznwpjj0hxx3jq86ha-waf-2.0.4
cc "@vrthra"
This used to be the case before commit 531e4b80c9 which seems to
have dropped it by accident.
Removes one unnecessary build of pkgconfig during stdenv bootstrapping.
"This release should be used instead of 3.0.1. This release fixes
several issues." - http://scons.org/scons-301-is-available.html
More than 90% of the 346 rebuilds succeed without any problems (I've
tested it against aeff3080d0). As far as I
can tell most of the problematic packages either failed before the
upgrade or for a reason that is unrelated to this SCons update. But it
is possible that this'll cause a few regressions, I'll try to watch out
for build failures on Hydra.
The attribute sconsPackages.scons_3_0_0 is still available in case this
breaks anything.
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information in some other way.
This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
- gcc not needed at all as dependency
- other D compilers can be used instead of dmd, so it's not good to use it as a runtime dependency.
- Adding checkPhase (disabled for now because network access is limited in sandbox mode)
- Improve package description.
"SCons release 3.0.0 now available from the download page at
SourceForge. This release should be used instead of 2.5.1. This release
fixes several issues. TThis will be the first release to support Python
versions earlier than 2.7 as well as 3.5+."
"NOTE: This is a major release. You should expect that some targets may
rebuild when upgrading. Significant changes in some python action
signatures. Also switching between PY 2.7 and PY 3.5, 3.6 will cause
rebuilds."
* Skip verifying checksums for already fetched packages.
Needed for two-staged building in Nix:
1. Build a fixed derivation with `bazel fetch` (filtered out of non-reproducable bits).
2. Build an actual derivation which uses fetched dependencies (skipping
checksums needed here because they depend on the build directory).
* Don't clean environment variables for children processes.
Needed for Nix compiler wrappers.
* master: (81 commits)
Add NixOS 17.09 AMIs
gradle: 4.2 -> 4.2.1
maintainers.nix: use my GitHub handle as maintainer name
fcitx-engines.rime: init at 0.3.2
brise: init at 2017-09-16
librime: init at 1.2.9
marisa: init at 0.2.4
opencc: build shared library and programs
josm: 12712 -> 12914
exa: 0.7.0 -> 0.8.0
krb5: add deprecation date for old configuration
rustRegistry: 2017-09-10 -> 2017-10-03
go-ethereum: Fix libusb segmentation faults on Darwin
tor-browser-bundle-bin: 7.0.5 -> 7.0.6
libsodium: 1.0.13 -> 1.0.15
tor-browser-bundle: geoip support
tor-browser-bundle: support transports obfs2,obfs3
tor-browser-bundle: bump https-everywhere to 2017.9.12
tint2: limit platforms to Linux since macOS is not supported and fails the tests
eclipse-plugin-vrapper: init at 0.72.0
...
