There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
The `.desktop` referenced a non existent script to run `QGroundControl`. This commits adds a `sed` command, which replaces the non existent script by the name of the `QGroundControl` binary in the relevant `.desktop` file.
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg -h` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpidl_rosmsg help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpserver --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp version` and found version 2.3.70.2
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp-config --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarp-config --version` and found version 2.3.70.2
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev -h` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdev help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpmanager-console --help` got 0 exit code
- ran `/nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2/bin/yarpdatadumper --help` got 0 exit code
- found 2.3.70.2 with grep in /nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2
- found 2.3.70.2 in filename of file in /nix/store/bp68k0rdxw13rxgy93lqlqmrmprz272g-yarp-2.3.70.2
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qgroundcontrol
override the whole configurePhase, so this hook isn't run at all.
Instead of using pushd/popd, I'm making it a bit more readable by just
spawning a subshell with the right working directory.
This fixes the build of qgroundcontrol and it now successfully compiles
on my machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
