nur-packages

commit a738c8ec17046c5c22b9b1ffd414d6b6ceaad79e
parent 4c5e5fdd0ff9d0684a345bbf353d978ed05eca21
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sat, 20 Jan 2024 12:24:51 +0400

Up

Diffstat:
M
pkgs/embedded/chdk/default.nix
 | 
4
++--
M
pkgs/geospatial/terracotta/default.nix
 | 
11
++++++++---
M
pkgs/gnss/gnsstk/default.nix
 | 
10
+++++++++-

3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix
@@ -11,7 +11,7 @@
 
 let
   version = "1.6.1";
-  revision = "6239"; # check on http://mighty-hoernsche.de/
+  revision = "6261"; # check on http://mighty-hoernsche.de/
   branch = "release-${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version)}";
   optFI2 = fi2key != null && fi2iv != null;
   batchBuild = platform == null || platformsub == null;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     url = "https://app.assembla.com/spaces/chdk/subversion/source/${revision}/branches/${branch}?_format=zip";
     extension = "zip";
     stripRoot = false;
-    hash = "sha256-gqb9JvPyzW77wlpZJqg3IYaGafQIzFopzGy9MZbr8Zs=";
+    hash = "sha256-VNkPju3nVxk1g5SzRZok5994JVupySbO7KZsD6sgXo8=";
   };
 
   nativeBuildInputs = [ gcc-arm-embedded zip ];
diff --git a/pkgs/geospatial/terracotta/default.nix b/pkgs/geospatial/terracotta/default.nix
@@ -2,18 +2,22 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "terracotta";
-  version = "0.7.5";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "DHI-GRAS";
     repo = "terracotta";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Q1rn7Rm1W0itXyuph/aApP+mCSy1VybIoBdEJm6GO68=";
+    hash = "sha256-HWNV5MwbylpcJ/u0iFe8gJJLdnvrnK4S8UMSCpuBlqs=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "\"setuptools_scm_git_archive\"," ""
+  '';
+
   nativeBuildInputs = with python3Packages; [
     setuptools-scm
-    setuptools-scm-git-archive
+    #setuptools-scm-git-archive
   ];
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -32,6 +36,7 @@ python3Packages.buildPythonApplication rec {
     pillow
     pyyaml
     shapely
+    sqlalchemy
     rasterio
     toml
     tqdm
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnsstk";
@@ -11,6 +11,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IRwhFlO9j9pAG7ZhXZz+v3nfMoSlbtm1kwrQABAIV4Y=";
   };
 
+  patches = [
+    # Fix compilation with GCC13
+    (fetchpatch {
+      url = "https://github.com/SGL-UT/gnsstk/pull/21/commits/16c2c7e5b8dc80bb0eb46792fcb1f6e3dcbffbf4.patch";
+      hash = "sha256-mIczf1OiHWl+poOulFPLSbNBu4ES8HNjhjOatACaAgI=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [