3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

32 commits

Author SHA1 Message Date
Ben Siraphob 4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
adisbladis 004febc0cb
subsurface: 5.0.1 -> 5.0.2 2021-07-03 20:28:21 -05:00
adisbladis 11027eba54
subsurface: googlemaps 2018-06-02 -> 2021-03-19 2021-06-14 22:34:05 -05:00
adisbladis 549b9305d6
subsurface: 4.9.10 -> 5.0.1 2021-06-14 19:57:51 -05:00
adisbladis 89433aacb7
subsurface: Add adisbladis as maintainer 2021-02-19 11:18:21 +01:00
adisbladis 16228356dd
subsurface: 4.9.6 -> 4.9.10 2021-02-19 11:18:09 +01:00
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Ben Siraphob 5d566c43b4 pkgs/applications: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
adisbladis 144aba6a51
subsurface: 4.9.3 -> 4.9.6 2020-07-22 13:19:08 +02:00
Jan Tojnar e89e2edc73
libusb-compat-0_1: rename from libusb 2020-04-28 05:33:41 +02:00
adisbladis 46f06e083b
Merge pull request #84822 from flokli/subsurface-4.9.3
subsurface: 4.8.2 -> 4.9.3
2020-04-14 11:05:27 +02:00
Florian Klink 435ff3118e subsurface: 4.8.2 -> 4.9.3
This bumps subsurface to 4.9.3.

As the subsurface-specific libdivecomputer source is shipped as a git
submodule these days, we can avoid having to fetch a separate tarball
that needs to be kept in sync (and is only uploaded for each release).

This also applies a patch on top of 4.9.3 to properly handle libgit2
versions 1.0 and later - conditional code for older libgit versions has
been removed upstream, but that's a nontrivial backport, which is why
this patch was added.
2020-04-11 12:51:32 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
adisbladis 8f5a37829d
subsurface: 4.8.1 -> 4.8.2 2018-09-22 21:41:03 +08:00
Florian Klink a3099c9d35 subsurface: 4.7.5 -> 4.8.1 (#45640)
Currently build is broken due to some invalid use of incomplete type 'class QHeaderView':
https://hydra.nixos.org/build/76951177/nixlog/2

CC: @bkchr
2018-08-26 14:45:06 +02:00
Bastian Köcher bf14737288 googlemaps: Move the .so to the right location
Fixes Subsurface googlemaps plugin detection.
2018-01-24 11:39:02 +01:00
Bastian Köcher d9e26a08b9 subsurface: fix compilation with Qt 5.10 2018-01-01 20:28:49 +03:00
adisbladis 52c707c84d
subsurface: 4.7.2 -> 4.7.5 2017-12-29 13:23:46 +01:00
Orivej Desh a4085e28b1 subsurface: 4.6.0 -> 4.7.2 2017-11-05 03:38:37 +00:00
Vladimír Čunát 24b1c6ee88
subsurface: disable parallel make
It was failing on Hydra:
http://hydra.nixos.org/build/48847277/nixlog/2/raw
2017-02-17 11:39:21 +01:00
Peter Hoeg 9550686be8 subsurface: 4.5.97 -> 4.6.0 (#22615)
We do a few more things:

 - libmarble and libdivecomputer with the subsurface patches have both been
   inlined for 2 reasons:
   a) nobody else is using these forks
   b) they need to be updated in lockstep with subsurface

 - instead of building libmarble against qtquick1, we now build using
   qtquickcontrols (qtquick2)

 - getting rid of qtquick1 also allows us to use the default qt (currently 5.6)

 - we get rid of some hacks to deal with library dependencies

 - instead of manually overriding various phases, we simply use cmakeFlags to
   pass proper parameters
2017-02-11 15:48:18 +01:00
Vladimír Čunát ee2edd4527
Merge branch 'master' into staging 2017-01-10 15:38:07 +01:00
Maximilian Güntner 9112410f65
subsurface: rev update for 4.5.97
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-10 00:00:59 +01:00
Vladimír Čunát 3a3b0263b0
subsurface: disable parallel make, as it fails on Hydra
http://hydra.nixos.org/build/46126151/nixlog/1/raw
2017-01-08 14:13:40 +01:00
Maximilian Güntner b00516ca31
subsurface: 4.5.6 -> 4.5.97 (beta 2)
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Maximilian Güntner 90377526eb subsurface: init at 4.5.6
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:54:52 +01:00