commit 4e204cddfbc015dee0b60ea536c5836dacc078f9
parent c8f0f2af1a303ece9ae12bbee18018186bd9f127
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 14 Mar 2024 09:45:34 +0400
Up
Diffstat:
12 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install nix
- uses: cachix/install-nix-action@v25
+ uses: cachix/install-nix-action@v26
with:
nix_path: "${{ matrix.nixPath }}"
extra_nix_config: |
diff --git a/flake.lock b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1709126324,
- "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1710066242,
- "narHash": "sha256-bO7kahLdawW7rBqUTfWgf9mdPYrnOo5DGvWRJa9N8Do=",
+ "lastModified": 1710283812,
+ "narHash": "sha256-F+s4//HwNEXtgxZ6PLoe5khDTmUukPYbjCvx7us2vww=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "db339f1706f555794b71aa4eb26a5a240fb6a599",
+ "rev": "73bf415737ceb66a6298f806f600cfe4dccd0a41",
"type": "github"
},
"original": {
diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zed";
- version = "0.125.3";
+ version = "0.126.2";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed.dmg";
- hash = "sha256-AoCWQjdVWDuerIMS/MumNR5ociav7aFeJ4vROC+Uofs=";
+ hash = "sha256-SlKHFLGcCMWdLdHC0T5oHMKXYj44pYvPM7jCsSx+B8E=";
};
sourceRoot = ".";
diff --git a/pkgs/geospatial/cogeo-mosaic/default.nix b/pkgs/geospatial/cogeo-mosaic/default.nix
@@ -40,6 +40,5 @@ python3Packages.buildPythonPackage rec {
homepage = "https://developmentseed.org/cogeo-mosaic/";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
- broken = stdenv.isDarwin; # pydantic-settings
};
}
diff --git a/pkgs/geospatial/mobroute/default.nix b/pkgs/geospatial/mobroute/default.nix
@@ -2,25 +2,19 @@
buildGoModule rec {
pname = "mobroute";
- version = "0.2.0";
+ version = "0.4.0";
src = fetchFromSourcehut {
owner = "~mil";
repo = "mobroute";
rev = "v${version}";
- hash = "sha256-mYoJnBE8d2UH8vwIrMFcI49q6o+ZLnkWs9QDkDDtRLk=";
+ hash = "sha256-CS4nHzK/WvnwHGfYGXGR8LsyndM5SFOcK5RS4hqmRps=";
};
- vendorHash = "sha256-ZIGchgsN1d6MqiY/SE5zS990A1Yyo8RwdbaQkRBXdC0=";
+ vendorHash = "sha256-PFiHfWTK2XT6/rK96myNwNS9gBWsEjVS5J3E2rEvRKk=";
- checkFlags = [
- # --- FAIL: Test_ExecuteCSA (0.00s)
- # csa_test.go:104: CSAExecute error: Couldn't determine cheapest arrival destination, consider increasing max_walk_seconds or max_transfer_seconds
- "-skip=Test_ExecuteCSA"
- ];
-
- postInstall = ''
- mv $out/bin/{src,mobroute}
+ preCheck = ''
+ export HOME=$TMPDIR
'';
meta = with lib; {
diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix
@@ -24,7 +24,6 @@ let
homepage = "https://developmentseed.org/titiler/";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
- broken = true; # fastapi>=0.107.0 not satisfied
};
titiler-core = python3Packages.buildPythonPackage {
@@ -36,6 +35,7 @@ let
nativeBuildInputs = with python3Packages; [ pdm-pep517 ];
propagatedBuildInputs = with python3Packages; [
fastapi
+ jinja2
rio-tiler
geojson-pydantic
simplejson
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://ascii-dash.sourceforge.io/";
license = licenses.mit;
platforms = platforms.unix;
- broken = stdenv.isDarwin; # mesa is broken
mainProgram = "ascii-dash";
};
})
diff --git a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
@@ -30,6 +30,5 @@ python3Packages.buildPythonApplication rec {
inherit (src.meta) homepage;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sikmir ];
- broken = stdenv.isLinux; # python3Packages.influxdb is broken
};
}
diff --git a/pkgs/suckless/edit/default.nix b/pkgs/suckless/edit/default.nix
@@ -11,12 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-woFX3nGSOY4RSNPGRAt40xHDNOPlO2t1kgzb8U2v5+U=";
};
- postPatch = ''
- substituteInPlace config.mk \
- --replace-fail "LDFLAGS" "#LDFLAGS"
- '';
-
- makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ];
+ makeFlags = [ "CC:=$(CC)" "LDFLAGS=" "PREFIX=$(out)" ];
meta = with lib; {
description = "A suckless, simple, featured text editor";
diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix
@@ -37,6 +37,5 @@ stdenv.mkDerivation {
license = licenses.publicDomain;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
- broken = stdenv.isDarwin; # mesa is broken
};
}
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
- version = "0-unstable-2024-02-08";
+ version = "0-unstable-2024-03-08";
src = fetchFromSourcehut {
owner = "~coco";
repo = "imscript";
- rev = "5623dd9b49377166fdb19ba4329db787b89aa447";
- hash = "sha256-+w6ceMmiU2JzbQnaSk9XV8N6qhV+oftljZ6ynXOAfsE=";
+ rev = "0798aa2dc3d648454b6cac71f8f515d296c186d4";
+ hash = "sha256-7OhJXUGzOBdQDw0d8fH6ubTin9vGU736zqZeEV18b24=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix
@@ -28,6 +28,5 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
- broken = stdenv.isDarwin; # farbfeld-utils is broken
};
})
