commit cf166e931e2b4ac3d8894c009e10800e6af14f77
parent 29654bda0c00e6ebafa6aae6350ba01bf055454b
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 13 Sep 2021 09:34:24 +0300
Up
Diffstat:
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1630500761,
- "narHash": "sha256-xjEjZro342lUPd5Z/fFwdAX1dMXXZ3tvPGqMpqs0U20=",
+ "lastModified": 1631315520,
+ "narHash": "sha256-Y8j0JYtZMifrHaWdTfTp1mYVXZ2PLJO/P0XZxMvo7KU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6cc260cfd60f094500b79e279069b499806bf6d8",
+ "rev": "b72ad04a8a324697d3fb92e19cd840379a902813",
"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-09-05";
+ version = "2021-09-12";
src = fetchurl {
url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";
- hash = "sha256-76SlpZaw/KFRdn67eY7bsGEbnMjjSzRoiDRx67LcDOw=";
+ hash = "sha256-oR4TOdA82TYumMdDBwP4bTy/HgjI4TRTzZgtOgT44Rg=";
};
sourceRoot = ".";
diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "morse-talk";
@@ -22,5 +22,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/nakarte/tracks_storage_server/default.nix b/pkgs/nakarte/tracks_storage_server/default.nix
@@ -62,6 +62,8 @@ python2Packages.buildPythonApplication rec {
--add-flags "$site_packages/init_db.py"
'';
+ passthru.psycopg2 = psycopg2;
+
meta = with lib; {
description = "Tracks storage server";
inherit (src.meta) homepage;