commit 00cee4d9074c42b2aa7efa9d705b000e4b1f5691 parent 84922e54da8a9138ed7bcefb2306c8d96e3f6fe9 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Fri, 10 Jul 2020 00:06:10 +0300 CI: fix build on darwin Diffstat:
16 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json @@ -476,7 +476,7 @@ "odict": { "branch": "master", "builtin": false, - "description": "A blazingly-fast replacement for Apple Dictionaries, Babylon, StarDict, etc.", + "description": "A blazingly-fast replacement for Apple Dictionaries, Babylon, StarDict, etc", "homepage": "https://odict.org", "owner": "odict", "repo": "odict", @@ -515,7 +515,7 @@ "pg_tileserv": { "branch": "master", "builtin": false, - "description": "A very thin PostGIS-only tile server in Go. Takes in HTTP tile requests, executes SQL, returns MVT tiles.", + "description": "A very thin PostGIS-only tile server in Go. Takes in HTTP tile requests, executes SQL, returns MVT tiles", "homepage": "https://github.com/CrunchyData/pg_tileserv", "owner": "CrunchyData", "repo": "pg_tileserv", diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix @@ -96,5 +96,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/data/maps/qmapshack-routinodb/default.nix b/pkgs/data/maps/qmapshack-routinodb/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { sources.geofabrik-russia-nwfd ]; - preferLocalBuild = true; - dontUnpack = true; installPhase = '' diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation { buildFlags = [ "out" "img" ]; - preferLocalBuild = true; - installPhase = '' install -Dm644 hr.img -t $out/share/gpxsee/maps ''; diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation { buildFlags = [ "out" "img" ]; - preferLocalBuild = true; - installPhase = '' install -Dm644 podm.img -t $out/share/gpxsee/maps ''; diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation { configurePhase = "make confload-${template}"; - preferLocalBuild = true; - installPhase = '' mkdir -p $out/bin substitute ${runScript} $out/bin/run-embox --subst-var out diff --git a/pkgs/tools/geo/cgpsmapper/default.nix b/pkgs/tools/geo/cgpsmapper/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = [ "i686-linux" "x86_64-linux" ]; + skip.ci = true; }; } diff --git a/pkgs/tools/geo/gmaptool/default.nix b/pkgs/tools/geo/gmaptool/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.cc-by-sa-30; maintainers = with maintainers; [ sikmir ]; platforms = [ "i686-linux" "x86_64-linux" ]; + skip.ci = true; }; } diff --git a/pkgs/tools/geo/imgdecode/default.nix b/pkgs/tools/geo/imgdecode/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPerlPackage, fetchzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }: +{ stdenv, buildPerlPackage, fetchzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }: buildPerlPackage { pname = "ocad2img"; @@ -38,11 +38,12 @@ buildPerlPackage { cp -r Convert $out/lib/perl5/site_perl ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Converter from OCAD map format to Garmin format"; homepage = "http://news.worldofo.com/2009/10/11/howto-convert-any-orienteering-map-to-a-garmin-map/"; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/tools/geo/sendmap20/default.nix b/pkgs/tools/geo/sendmap20/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = [ "i686-linux" "x86_64-linux" ]; + skip.ci = true; }; } diff --git a/pkgs/tools/networking/ish/default.nix b/pkgs/tools/networking/ish/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.free; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; } diff --git a/pkgs/tools/networking/ptunnel/default.nix b/pkgs/tools/networking/ptunnel/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + skip.ci = stdenv.isDarwin; }; }