nur-packages

commit d4254bd780c3b976f9b7e269c307bc2b80a20680
parent 003aeb0218bd832dc14b5349d2a7e659d2b27f67
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Fri,  8 Nov 2024 17:53:51 +0400

Up

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/darwin/zed/default.nix
 | 
4
++--
M
pkgs/garmin/gimgtools/default.nix
 | 
2
+-
M
pkgs/geospatial/mapsoft/2.nix
 | 
4
+++-
M
pkgs/misc/repolocli/default.nix
 | 
2
+-
M
pkgs/misc/xtr/default.nix
 | 
2
+-
M
pkgs/mqtt/mqtt-cli/default.nix
 | 
4
++--

7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730272153,
-        "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
+        "lastModified": 1730958623,
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zed";
-  version = "0.159.1-pre";
+  version = "0.161.0-pre";
 
   src = fetchurl {
     url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed.dmg";
-    hash = "sha256-2xrKPqQGPuGMT4sVGo5RWpqu1UZpR603NaiQKsXWD7Q=";
+    hash = "sha256-LI+aH0sPIujPE0FEGRqOZIUugyNQtvI+9abhhzUHNfc=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AgZqczhYr5frD9Id75if/38O057BC6YfeGquFpidKZI=";
   };
 
-  buildInputs = lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   makeFlags = [ "CC:=$(CC)" ];
 
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -14,6 +14,7 @@
   imagemagick,
   jansson,
   curl,
+  libiconv,
   libjpeg,
   libpng,
   librsvg,
@@ -114,11 +115,12 @@ stdenv.mkDerivation (finalAttrs: {
     libzip
     proj
     shapelib
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   env = {
     SKIP_IMG_DIFFS = 1;
     NIX_CFLAGS_COMPILE = "-std=c++17";
+    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
   };
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/misc/repolocli/default.nix b/pkgs/misc/repolocli/default.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
 
   buildInputs =
     lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       curl
       libiconv
     ];
diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  buildInputs = lib.optionals stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
     darwin.apple_sdk.frameworks.Foundation
   ];
diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mqtt-cli";
-  version = "4.33.0";
+  version = "4.34.0";
 
   src = fetchfromgh {
     owner = "hivemq";
     repo = "mqtt-cli";
     name = "mqtt-cli-${finalAttrs.version}.jar";
-    hash = "sha256-WIXhkDkx+B/IL79TRLbckPWZ2+8R/80CEyfFvCvCNc4=";
+    hash = "sha256-1VORHAxIExsRp5jo+nrnlCqImVbCHPKq0Jwpll26eA8=";
     version = "v${finalAttrs.version}";
   };