commit 2ceb45f57194ff2493b02d92a16c64fc5eb022d9
parent 91ad36d5d8ecdff8964fa8aeeb54457e17819a24
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 16 Jan 2025 19:58:36 +0400
Up
Diffstat:
7 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1736848588,
- "narHash": "sha256-9B6fQqphF3j9lpcxQnKyIUgp3NyGi7ikb9CjCYqixcY=",
+ "lastModified": 1736943799,
+ "narHash": "sha256-BYsp8PA1j691FupfrLVOQzm4CaYaKtkh4U+KuGMnBWw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "357cd3dfdb8993af11268d755d53357720675e66",
+ "rev": "ae2fb9f1fb5fcf17fb59f25c2a881c170c501d6f",
"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.169.0-pre";
+ version = "0.170.0-pre";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg";
- hash = "sha256-afpFZidw095WQEp9QePzWjuKnbqVGJ2j8g9zpOe7Bzk=";
+ hash = "sha256-NpyWPqtlxTmHZZS3Vp+QBbgq9b/fZWqbkUqQ0hjyDMo=";
};
sourceRoot = ".";
diff --git a/pkgs/data/maps/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix
@@ -5,10 +5,10 @@
}:
fetchwebarchive {
- name = "qmapshack-onlinemaps-2022-09-02";
+ name = "qmapshack-onlinemaps-2024-07-29";
url = "http://www.mtb-touring.net/wp-content/uploads/Onlinemaps.zip";
- timestamp = "20231026090331";
- hash = "sha256-5xXyaWhUwOZPGb+unYh4A0Hzznk2nRPHtIxdiiQHlHY=";
+ timestamp = "20250116120355";
+ hash = "sha256-mgeskUSjnQJZAp9LXyXXGFoAUEXmhqy4wRYquVUygbc=";
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "osm-extracts";
- version = "241110";
+ version = "250115";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-ixfuHOkkOxxMb2YGsXII6tzWnxG6/E01u8byVgM12OM=";
+ hash = "sha256-r7y20shGOxk0PXtPnpeAXFsJSOKlgpiv8jAdBezQVaA=";
};
dontUnpack = true;
diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
installFlags = [ "PREFIX=$(out)" ];
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
meta = {
description = "Collection of command line video editing utilities";
homepage = "https://tools.suckless.org/blind/";
diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-P7RWdsxYv/P7K+BfvzkOzCCSMppSxacKVj19MPgeV7I=";
};
+ makeFlags = [ "CC:=$(CC)" ];
+
installFlags = [ "PREFIX=$(out)" ];
meta = {
diff --git a/pkgs/suckless/webdump/default.nix b/pkgs/suckless/webdump/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-holkUH9ImpcVVJo429jq9BqB6YRpqifQBmbUrD6TzgU=";
};
+ makeFlags = [ "RANLIB:=$(RANLIB)" ];
+
installFlags = [ "PREFIX=$(out)" ];
meta = {