nur-packages

commit bec2f47a0f76edd2f25730e5aa1f9d37c8b576d9
parent 46d4ac88993e6c4c875097e1771faaca370f1174
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Wed, 31 Aug 2022 18:04:40 +0300

Up

Diffstat:
M
pkgs/data/dicts/dadako/base.nix
 | 
15
+++++----------
M
pkgs/data/dicts/dadako/default.nix
 | 
4
++--
M
pkgs/data/dicts/huzheng/base.nix
 | 
8
++------
M
pkgs/data/misc/osm-extracts/default.nix
 | 
4
++--
M
pkgs/data/misc/routinodb/default.nix
 | 
4
++--
M
pkgs/geospatial/mapsoft/default.nix
 | 
8
++++----

6 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/pkgs/data/dicts/dadako/base.nix b/pkgs/data/dicts/dadako/base.nix
@@ -1,19 +1,14 @@
-{ lib, stdenvNoCC, fetchurl, unzip, pname, version, filename, sha256, description }:
+{ lib, srcOnly, fetchzip, unzip, pname, version, filename, hash, description }:
 
-stdenvNoCC.mkDerivation {
+srcOnly {
   inherit pname version;
 
-  src = fetchurl {
+  src = fetchzip {
     url = "http://dadako.narod.ru/GoldenDict/${filename}";
-    inherit sha256;
+    inherit hash;
+    stripRoot = false;
   };
 
-  dontUnpack = true;
-
-  installPhase = "${unzip}/bin/unzip $src -d $out";
-
-  preferLocalBuild = true;
-
   meta = with lib; {
     inherit description;
     homepage = "http://dadako.narod.ru/paperpoe.htm";
diff --git a/pkgs/data/dicts/dadako/default.nix b/pkgs/data/dicts/dadako/default.nix
@@ -8,7 +8,7 @@ in
     inherit version;
     filename = "rus-fin_Pogovorki_${lib.replaceStrings [ "." ] [ "_" ] version}GD.zip";
     description = "Русские поговорки и их финские аналоги (Rus-Fin)";
-    sha256 = "0zvzkdl2wb8dvfbnyv3azzxygqhzcpcj93l422kb2snssfm2451v";
+    hash = "sha256-9tOdf+5INmhbsek9HT5reBTrflhOJ614tRfMOHfMdFA=";
   };
 
   fin-fin-synonyms = callPackage ./base.nix {
@@ -16,6 +16,6 @@ in
     inherit version;
     filename = "fin-fin_Synonyms_${lib.replaceStrings [ "." ] [ "_" ] version}GD.zip";
     description = "Finnish Synonyms (Fin-Fin)";
-    sha256 = "1757v6x89jghl9hz57hq9dm8lgx6d48rnrpfc2zpijxv8xk8g5w7";
+    hash = "sha256-Yc+L9v6gNrGaD8FJ36CtkPovWEekwuaLYsG7E/WH5Dk=";
   };
 }
diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix
@@ -1,6 +1,6 @@
-{ lib, stdenvNoCC, fetchurl, pname, version, filename, hash, description }:
+{ lib, srcOnly, fetchurl, pname, version, filename, hash, description }:
 
-stdenvNoCC.mkDerivation {
+srcOnly {
   inherit pname version;
 
   src = fetchurl {
@@ -8,10 +8,6 @@ stdenvNoCC.mkDerivation {
     inherit hash;
   };
 
-  installPhase = "cp -a . $out";
-
-  preferLocalBuild = true;
-
   meta = with lib; {
     inherit description;
     homepage = "http://download.huzheng.org/";
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 = "220819";
+  version = "220830";
 
   src = fetchurl {
     url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
-    hash = "sha256-2LhTMEGeJVLstmOzn1/MJ/Htg2B7Bza4xcxHj68Hr2A=";
+    hash = "sha256-kzn8Rs/ZRekHF5CJ5SZeY+q1s642o+ZSJdRhNvwutZw=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "routinodb";
-  version = "220814";
+  version = "220830";
 
   srcs = [
     (fetchurl {
       url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
-      hash = "sha256-G3WylejNaEmCUXfbPAf/4c2E9+0+RehpECwKwJfeGIs=";
+      hash = "sha256-kzn8Rs/ZRekHF5CJ5SZeY+q1s642o+ZSJdRhNvwutZw=";
     })
   ];
 
diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mapsoft";
-  version = "2021-06-10";
+  version = "20220624-alt1";
 
   src = fetchFromGitHub {
     owner = "ushakov";
-    repo = pname;
-    rev = "0fbf1e39f3d7fbe3f5c67f56997745ac6526c8b4";
-    hash = "sha256-fU7Nwa5jtt07JTOnuai0d2Tyk8N9Jq9PdwDOCl7FigE=";
+    repo = "mapsoft";
+    rev = "e51645da7bbb7f6ca6505dd6e6f9a009556a78c1";
+    hash = "sha256-GPlLVMWqYXs0K3UzQnYlWPm0t9qz6rzQmW1dTOUtPDY=";
   };
 
   patches = [ ./0001-fix-build.patch ];