nur-packages

commit 34b753cd2fd38a9331f3eaa11143c09ababe5e19
parent 67b599a82b074091a14737790fcfbba2d90b22a5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Thu,  6 Apr 2023 20:30:27 +0400

Up

Diffstat:
M
flake.lock
 | 
12
++++++------
M
pkgs/default.nix
 | 
4
+++-
M
pkgs/geospatial/render_geojson/default.nix
 | 
4
++--
M
pkgs/geospatial/tdh/base.nix
 | 
1
+
M
pkgs/geospatial/tdh/default.nix
 | 
4
++--

5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "lastModified": 1680776469,
+        "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680273054,
-        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
+        "lastModified": 1680728981,
+        "narHash": "sha256-ZhsViPJJvET7iLyD9ey63q6GwPKquDqIbOn2letvb/A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
+        "rev": "38263d02cf3a22e011e137b8f67cdf8419f28015",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -213,7 +213,9 @@ lib.makeScope newScope (
     py-staticmaps = callPackage ./geospatial/py-staticmaps { };
     pysheds = callPackage ./geospatial/pysheds { };
     pystac = callPackage ./geospatial/pystac { };
-    render_geojson = callPackage ./geospatial/render_geojson { };
+    render_geojson = callPackage ./geospatial/render_geojson {
+      wxGTK = pkgs.wxGTK32;
+    };
     rio-cogeo = callPackage ./geospatial/rio-cogeo { };
     rio-color = callPackage ./geospatial/rio-color { };
     rio-mbtiles = callPackage ./geospatial/rio-mbtiles { };
diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "render_geojson";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ wxGTK30 ];
+  buildInputs = [ wxGTK ];
 
   meta = with lib; {
     description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library";
diff --git a/pkgs/geospatial/tdh/base.nix b/pkgs/geospatial/tdh/base.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ sikmir ];
     platforms = [ "x86_64-linux" ];
     skip.ci = true;
+    broken = true; # wxGTK30 has been removed from nixpkgs as it has reached end of life
   };
 }
diff --git a/pkgs/geospatial/tdh/default.nix b/pkgs/geospatial/tdh/default.nix
@@ -1,7 +1,7 @@
-{ callPackage, fetchFromGitHub, wxGTK30, gcc8Stdenv }:
+{ callPackage, fetchFromGitHub, wxGTK, gcc8Stdenv }:
 let
   # Fix mismatch between the program and library build versions
-  wxGTK30_gcc8 = (wxGTK30.override { stdenv = gcc8Stdenv; compat26 = false; }).overrideAttrs (old: {
+  wxGTK30_gcc8 = (wxGTK.override { stdenv = gcc8Stdenv; compat26 = false; }).overrideAttrs (old: {
     version = "3.0.5";
     src = fetchFromGitHub {
       owner = "wxWidgets";