commit 583a0b2ca5ea29ca847be21b2a730559ccb3b838
parent 2c04408ac73dc06702184aa87097af9c9d4bf927
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 27 May 2024 18:11:31 +0400
Up
Diffstat:
6 files changed, 11 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
- name: Show nixpkgs version
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
- name: Setup cachix
- uses: cachix/cachix-action@v14
+ uses: cachix/cachix-action@v15
with:
name: ${{ matrix.cachixName }}
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1716451822,
- "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=",
+ "lastModified": 1716715802,
+ "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3305b2b25e4ae4baee872346eae133cf6f611783",
+ "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
"type": "github"
},
"original": {
diff --git a/pkgs/geospatial/mapsoft/0002-fix-build.patch b/pkgs/geospatial/mapsoft/0002-fix-build.patch
@@ -1,24 +0,0 @@
-diff --git a/programs/ms2render/ms2render.cpp b/programs/ms2render/ms2render.cpp
-index 6381e37..e36b79d 100644
---- a/programs/ms2render/ms2render.cpp
-+++ b/programs/ms2render/ms2render.cpp
-@@ -14,6 +14,7 @@
- #include "geo_render/gobj_maps.h"
- #include "geo_render/gobj_srtm.h"
- //#include "draw_pulk_grid.h"
-+#include "srtm/srtm.h"
- #include "viewer/gobj_multi.h"
- #include <cstring>
-
-@@ -126,9 +127,9 @@ main(int argc, char *argv[]){
-
-
- // Srtm layer
-- std::shared_ptr<SRTMSurf> s;
-+ std::shared_ptr<SRTM> s;
- if (O.exists("srtm")){
-- s.reset(new SRTMSurf(O));
-+ s.reset(new SRTM(O));
- obj.add(5, std::shared_ptr<GObjSRTM>(new GObjSRTM(s.get(),O)));
- }
-
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -36,12 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
owner = "slazav";
repo = "mapsoft2";
rev = "${finalAttrs.version}-alt1";
- hash = "sha256-XT3oDPu+GE3WfzlDk7jELhGmPknL0m+cgTxH4opGjFs=";
+ hash = "sha256-ghLuPF/Mz2XSslJ4l+VQco8+uRpxxMvugCx5kc2kBVE=";
fetchSubmodules = true;
};
- patches = [ ./0002-fix-build.patch ];
-
postPatch = ''
substituteInPlace modules/getopt/Makefile \
--replace-fail "SCRIPT_TESTS := getopt" ""
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
- version = "0-unstable-2024-05-13";
+ version = "0-unstable-2024-05-21";
src = fetchFromSourcehut {
owner = "~coco";
repo = "imscript";
- rev = "3a3d17d15ac940917bfe92fd115d0d2ae3605205";
- hash = "sha256-OOva23VxTl2Q+9+SIecazKBcan8UrJd7SMKeA9nnhlQ=";
+ rev = "4471616ad570350c8b046d683c613178d949284e";
+ hash = "sha256-Dbtzaru63BXdi+1m0iKM0QGaunJB/52clgQOxVaJg60=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
- version = "0-unstable-2024-04-29";
+ version = "0-unstable-2024-05-11";
src = fetchFromGitHub {
owner = "kyx0r";
repo = "nextvi";
- rev = "01f4dff99aab251ea502d17edcde5b16c0807977";
- hash = "sha256-fKrlIgK5fCDh+WQyLpcF+k8NKOriJbGF3OVUwN/Ld78=";
+ rev = "506b29c1ef7a8d267a5a398541cfc573c8948824";
+ hash = "sha256-xIXrRYHz9YRi0Tz5H3uelHS9cTju67cV1fxazw09Aic=";
};
buildPhase = ''
