commit d20fca768845af6a4529d630d6101ce5637f08e6
parent 319ef33e9f3e5c546e22b58af7a42145b4cdccb0
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 2 Nov 2021 02:12:07 +0300
Up
Diffstat:
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1633422745,
- "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=",
+ "lastModified": 1635781173,
+ "narHash": "sha256-nTA2y2jIJiVj5RawHUNhlZUIy5J/Q2CA6YP4T1qBkLo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a",
+ "rev": "7053541084bf5ce2921ef307e5585d39d7ba8b3f",
"type": "github"
},
"original": {
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "maptourist";
- version = "2021-10-22";
+ version = "2021-11-01";
src = fetchurl {
url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";
- hash = "sha256-wGy4floOFuLJb2eRljd4dUIezsX3AkujOgSu0sqeHic=";
+ hash = "sha256-18ScFe0hgWJjJeA8b8+ttFfwlNYx+nhYe+miFhHql6I=";
};
sourceRoot = ".";
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
@@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "routinodb";
- version = "211021";
+ version = "211031";
srcs = [
(fetchurl {
url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";
- hash = "sha256-57IpvP9ygQoaBMfbEn9cuaX6SonyyjOhaP1HcMmEWOM=";
+ hash = "sha256-OHivcvm/w/9CAD1uXMhxInNh+c1yxU40CfOY7LqD5T0=";
})
(fetchurl {
url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";
- hash = "sha256-usbKCiJotnODkn1jwPNmRgmYqEoAbku2zDTlZ3q/98E=";
+ hash = "sha256-VctE/Bo/W+6m66WbmkGk4b9Xox5gWGRaWrRyCYILY6o=";
})
(fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-U7vR/EgDXOChoVxGpi1XWw6r3Ey1tdeJtk3vcLRzRGs=";
+ hash = "sha256-JQzlv5uSUbGE9UWxn0c9TDubsUnG7CVnhJR2PUN6Hv8=";
})
];
diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "map-machine";
- version = "2021-10-14";
+ version = "2021-11-01";
disabled = python3Packages.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "enzet";
repo = pname;
- rev = "d071002376c7aeb2753184422642f50330e79af3";
- hash = "sha256-T2n0hFHVdTC1rZtOt4DtEQAGWYKKADGJDE9WnLeZn0A=";
+ rev = "a73006e67eec43772b7d94ab4c2a532eb05531c7";
+ hash = "sha256-8o368y98L77JOonAP7DrqfwBU/wQ/SdNmWe7I9Y2xro=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/osm/osm-python-tools/default.nix b/pkgs/osm/osm-python-tools/default.nix
@@ -41,5 +41,6 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
+ broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/137678
};
}
diff --git a/pkgs/suckless/json2tsv/default.nix b/pkgs/suckless/json2tsv/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "json2tsv";
- version = "0.7";
+ version = "0.8";
src = fetchgit {
url = "git://git.codemadness.org/${pname}";
rev = version;
- sha256 = "sha256-e2seXwJse3L/Lb4nHbGLaDCj4obxMWbTKHbYlnIGqpU=";
+ sha256 = "sha256-bpXEVWayFQYJDXDzaJIFuoNJubgbw5URNOpYz3K0DPI=";
};
installFlags = [ "PREFIX=$(out)" ];