commit 180ddaabfda35994e6ed763e3ee670b0a6d0e31d
parent 5f1c74dba20f5ab38495db3e3814dc6a8e2633e9
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 28 Mar 2022 19:37:58 +0300
Up
Diffstat:
9 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
- "lastModified": 1644229661,
- "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+ "lastModified": 1648297722,
+ "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+ "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github"
},
"original": {
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1647350163,
- "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=",
+ "lastModified": 1648219316,
+ "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
+ "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
"type": "github"
},
"original": {
diff --git a/pkgs/data/misc/osm-extracts/default.nix b/pkgs/data/misc/osm-extracts/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osm-extracts-${region}";
- version = "211021";
+ version = "220327";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-U7vR/EgDXOChoVxGpi1XWw6r3Ey1tdeJtk3vcLRzRGs=";
+ hash = "sha256-KqVZ1z4f+IETUN4IhuSQX1O9wsg8Tmsu1UQwoo2sr8A=";
};
dontUnpack = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -336,7 +336,9 @@ lib.makeScope newScope (
phyghtmap = callPackage ./osm/phyghtmap { };
sdlmap = callPackage ./osm/sdlmap { };
smopy = callPackage ./osm/smopy { };
- smrender = callPackage ./osm/smrender { };
+ smrender = callPackage ./osm/smrender {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
taginfo-tools = callPackage ./osm/taginfo-tools { };
tilemaker = callPackage ./osm/tilemaker { };
vectiler = callPackage ./osm/vectiler { };
diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix
@@ -29,6 +29,5 @@ python3Packages.buildPythonPackage rec {
homepage = "https://github.com/geopandas/contextily";
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/development/python-modules/earthpy/default.nix b/pkgs/development/python-modules/earthpy/default.nix
@@ -27,6 +27,5 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix
@@ -33,6 +33,5 @@ python3Packages.buildPythonApplication rec {
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix
@@ -25,6 +25,5 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix
@@ -24,6 +24,5 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, cairo, librsvg }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, cairo, librsvg
+, Foundation, memstreamHook
+}:
stdenv.mkDerivation rec {
pname = "smrender";
@@ -13,7 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ cairo librsvg ];
+ buildInputs = [ cairo librsvg ]
+ ++ lib.optionals stdenv.isDarwin [ Foundation memstreamHook ];
doInstallCheck = true;
installCheckPhase = ''
@@ -27,7 +30,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
- platforms = platforms.linux;
- skip.ci = stdenv.isDarwin;
+ platforms = platforms.unix;
};
}
