commit 8aeb9fd435737af986947f563701b1ec43aa0394 parent 9204a7cdd1804c4c27b430fa3b63bde6ea72be5e Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 30 Sep 2021 20:56:17 +0300 Up Diffstat:
35 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml @@ -2,6 +2,8 @@ name: "Build and populate cache" on: pull_request: push: + branches: + - master schedule: - cron: '51 2 * * *' jobs: @@ -22,7 +24,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v2.3.4 - name: Install nix - uses: cachix/install-nix-action@v13 + uses: cachix/install-nix-action@v14 with: nix_path: "${{ matrix.nixPath }}" - name: Show nixpkgs version diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -70,8 +70,6 @@ lib.makeScope newScope ( foma = callPackage ./development/libraries/foma { libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; - geographiclib = callPackage ./development/libraries/geographiclib { }; - gpxlib = callPackage ./development/libraries/gpxlib { }; hfst = callPackage ./development/libraries/hfst { }; libshell = callPackage ./development/libraries/libshell { }; microjson = callPackage ./development/libraries/microjson { }; @@ -185,6 +183,7 @@ lib.makeScope newScope ( elevation = callPackage ./geospatial/elevation { click = click-6-7; }; + geographiclib = callPackage ./geospatial/geographiclib { }; go-staticmaps = callPackage ./geospatial/go-staticmaps { }; mapsoft = callPackage ./geospatial/mapsoft { }; mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { }; @@ -219,6 +218,7 @@ lib.makeScope newScope ( gpx-layer = perlPackages.callPackage ./gpx/gpx-layer { }; gpx2yaml = callPackage ./gpx/gpx2yaml { }; gpxchart = callPackage ./gpx/gpxchart { }; + gpxlib = callPackage ./gpx/gpxlib { }; gpxsee-bin = callPackage ./gpx/gpxsee/bin.nix { }; gpxtools = callPackage ./gpx/gpxtools { }; gpxtrackposter = callPackage ./gpx/gpxtrackposter { }; diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -31,6 +31,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix @@ -18,6 +18,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/wikitextprocessor/default.nix b/pkgs/development/python-modules/wikitextprocessor/default.nix @@ -25,6 +25,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/wiktfinnish/default.nix b/pkgs/development/python-modules/wiktfinnish/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/dict/gt4gd/default.nix b/pkgs/dict/gt4gd/default.nix @@ -26,6 +26,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/dict/lsdreader/default.nix b/pkgs/dict/lsdreader/default.nix @@ -18,6 +18,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/dict/opendict/default.nix b/pkgs/dict/opendict/default.nix @@ -28,6 +28,5 @@ python2Packages.buildPythonApplication rec { homepage = "http://opendict.sf.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/dict/tatoebatools/default.nix b/pkgs/dict/tatoebatools/default.nix @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678 }; } diff --git a/pkgs/dict/wiktextract/default.nix b/pkgs/dict/wiktextract/default.nix @@ -33,6 +33,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/dict/zdict/default.nix b/pkgs/dict/zdict/default.nix @@ -35,7 +35,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678 }; } diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix @@ -22,6 +22,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/gemini/qute-gemini/default.nix b/pkgs/gemini/qute-gemini/default.nix @@ -23,6 +23,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/geospatial/elevation/default.nix b/pkgs/geospatial/elevation/default.nix @@ -52,6 +52,5 @@ python3Packages.buildPythonApplication rec { homepage = "http://elevation.bopen.eu/"; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/geospatial/geographiclib/default.nix diff --git a/pkgs/geospatial/mbtiles2osmand/default.nix b/pkgs/geospatial/mbtiles2osmand/default.nix @@ -39,6 +39,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/geospatial/py-staticmaps/default.nix b/pkgs/geospatial/py-staticmaps/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678 }; } diff --git a/pkgs/geospatial/supermercado/default.nix b/pkgs/geospatial/supermercado/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix @@ -34,6 +34,5 @@ python3Packages.buildPythonApplication rec { homepage = "https://docs.mapbox.com/mapbox-tiling-service"; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/geospatial/tpkutils/default.nix b/pkgs/geospatial/tpkutils/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/gpx/cmpgpx/default.nix b/pkgs/gpx/cmpgpx/default.nix @@ -27,6 +27,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.unlicense; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/gpx/gpx-cmd-tools/default.nix b/pkgs/gpx/gpx-cmd-tools/default.nix @@ -18,6 +18,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix @@ -28,6 +28,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix @@ -54,6 +54,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/misc/apibackuper/default.nix b/pkgs/misc/apibackuper/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix @@ -18,6 +18,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/misc/lazyscraper/default.nix b/pkgs/misc/lazyscraper/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix @@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; }; } diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix @@ -64,7 +64,6 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; }; } diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix @@ -36,6 +36,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix @@ -37,6 +37,5 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; }; } diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix @@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://katze.tfiu.de/projects/phyghtmap"; license = licenses.gpl2Plus; maintainers = [ maintainers.sikmir ]; - platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678 }; }