commit 322263968556fd2ae43fbac72c424741ee71eccf
parent 98b86843e688bb531279c31ada9b09759ce56cd4
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 4 Apr 2025 21:14:17 +0400
Up
Diffstat:
6 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1743076231,
- "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
+ "lastModified": 1743689281,
+ "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "6c5963357f3c1c840201eda129a99d455074db04",
+ "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
"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.180.2-pre";
+ version = "0.181.2-pre";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg";
- hash = "sha256-0fApoCjvhcF9W9yyBgC8SR433QcT0J9/3Wja43VDWks=";
+ hash = "sha256-moYVrNM3I4DFj+s0WL/hjHDz/jsIKHg6O1LbjuVlFg4=";
};
sourceRoot = ".";
diff --git a/pkgs/data/maps/slazav/fi.nix b/pkgs/data/maps/slazav/fi.nix
@@ -4,8 +4,10 @@
fetchFromGitHub,
bc,
cgpsmapper,
+ fig2dev,
git,
gmaptool,
+ imagemagick,
libjpeg,
mapsoft2,
netpbm,
@@ -16,13 +18,13 @@
stdenv.mkDerivation {
pname = "slazav-fi";
- version = "2025-02-01";
+ version = "2025-03-20";
src = fetchFromGitHub {
owner = "slazav";
repo = "map_fi";
- rev = "1cc868653012c2a31441ccc0e8246be9666851b2";
- hash = "sha256-6psZAaBLQ9LvrZgMXKkKHt9k4KJciF9rCZSYsFGjew4=";
+ rev = "6517526cd0b92c4a272139065dbbc0779bce67b0";
+ hash = "sha256-EVGjkw4ouvlGl8ugwbyvVFO/SscbCprplqUbVi8uNio=";
leaveDotGit = true;
};
@@ -34,8 +36,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [
bc
cgpsmapper
+ fig2dev
git
gmaptool
+ imagemagick
libjpeg
mapsoft2
netpbm
@@ -44,6 +48,10 @@ stdenv.mkDerivation {
zip
];
+ preBuild = ''
+ make -C pics
+ '';
+
buildFlags = [ "out" ];
installPhase = ''
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation {
pname = "slazav-hr";
- version = "2025-01-27";
+ version = "2025-03-03";
src = fetchFromGitHub {
owner = "slazav";
repo = "map_hr";
- rev = "947b237a977453db2e5cbb961d5b3842ce770697";
- hash = "sha256-nXd1y1TVIhwS3XP2DzeFKsDsdYWk2Q6xOtlh9kmve8o=";
+ rev = "b61f2a83c12b860a833a3f09f78de203edb88569";
+ hash = "sha256-/o0SlycXWvsHawz0bJcW9+UrBpS21ho/lHNkqhWCIpo=";
leaveDotGit = true;
};
diff --git a/pkgs/geospatial/sasplanet/default.nix b/pkgs/geospatial/sasplanet/default.nix
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sasplanet";
- version = "241111";
+ version = "250404";
src = fetchfromgh {
owner = "sasgis";
repo = "sas.planet.src";
tag = "v.${finalAttrs.version}";
- hash = "sha256-vhBQEKansoPWiWk82eVY0ja7HNRyWphwulRg5lBIFIA=";
+ hash = "sha256-2h0mVH1IDtfHbXsjqdbxwPxQHWAEA+B9LCiBIv8zUo8=";
name = "SAS.Planet.Release.${finalAttrs.version}.zip";
};
diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix
@@ -1,10 +1,10 @@
{
lib,
- buildGo122Module,
+ buildGoModule,
fetchFromGitHub,
}:
-buildGo122Module {
+buildGoModule {
pname = "nanodns";
version = "0-unstable-2021-10-29";