chore: bump lockfile

fix: autoDir for packages and flat directories
feat: bump ahab to v0.4.2
2026-03-02 15:31:06 +01:00 · 2026-03-02 15:30:34 +01:00 · 2026-03-02 14:53:58 +01:00 · 2026-03-02 14:48:54 +01:00 · 2026-03-02 14:48:49 +01:00 · 2026-03-02 14:48:13 +01:00
11 changed files with 245 additions and 44 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -89,11 +89,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1772160751,
-        "narHash": "sha256-PXv9nrm8HHLGIU2B1XRjOvzlPW9sFdzbtWiJQ1wE8dM=",
+        "lastModified": 1772252606,
+        "narHash": "sha256-SiIhFq4XbD3LmODQ2mTtakRBnjBn/KoSgAOId1cL1Ks=",
        "owner": "ryoppippi",
        "repo": "claude-code-overlay",
-        "rev": "662bdbf5ea61fc3cde167bbe3686343a149ea6c6",
+        "rev": "b1ebf027412136bbbe4202741c3d48721644bc4b",
        "type": "github"
      },
      "original": {
@@ -157,11 +157,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -273,11 +273,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1771744638,
-        "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=",
+        "lastModified": 1772380125,
+        "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0",
+        "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3",
        "type": "github"
      },
      "original": {
@@ -318,11 +318,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1771891493,
-        "narHash": "sha256-L0OCnG8rsWJYZ3mzHSz0iENtlBXQjjcGgvMgsBqN14U=",
+        "lastModified": 1772409903,
+        "narHash": "sha256-yue9XaZ7WHOFJmm3DMEmrF536pHwGxTxh/xr0f1MzNU=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "7db85d094c68697fc36801bccdf015b4c2bdb274",
+        "rev": "28962d176db883e4fda4b808e220051f376969da",
        "type": "github"
      },
      "original": {
@@ -334,11 +334,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1771885993,
-        "narHash": "sha256-2c4H+5f0qhsp13Vx8pbsGiSRTHBJIfQaRAAUSHGEpgo=",
+        "lastModified": 1772353308,
+        "narHash": "sha256-k/3msPgpWW9CRFIp3nz6hJzV+GArXw4m35c0t6fKJK4=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "d9d8c660fd5559d928c8870a21970a375674e310",
+        "rev": "563f9ef7994a35686419b4524cd772c97960dac1",
        "type": "github"
      },
      "original": {
@@ -365,11 +365,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1771932323,
-        "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=",
+        "lastModified": 1772461137,
+        "narHash": "sha256-5MFNMLcDmaXQbdGJVITwFTqJq3IVok4TSR/Oa/DbJys=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "89bb5c5da7a857869cc88ef9b856bffdff8af264",
+        "rev": "388c66870001909259d1879acd2e3e1108c1854d",
        "type": "github"
      },
      "original": {
@@ -381,11 +381,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1771482645,
-        "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
+        "lastModified": 1772419343,
+        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
+        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
        "type": "github"
      },
      "original": {
@@ -397,11 +397,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1771423170,
-        "narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=",
+        "lastModified": 1772173633,
+        "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd",
+        "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
        "type": "github"
      },
      "original": {
@@ -413,11 +413,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1771714954,
-        "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=",
+        "lastModified": 1772047000,
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
        "type": "github"
      },
      "original": {
--- a/8
+++ b/8
@@ -17,6 +17,14 @@ update:
 # update flake inputs, rebuild and switch
 bump: update switch

+# update a package to latest version
+update-package pkg:
+    bash packages/{{pkg}}/update.sh
+
+# update all packages with update scripts
+update-package-all:
+    @for script in packages/*/update.sh; do bash "$script"; done
+
 # build installation iso
 iso:
    nixos-rebuild build-image --image-variant iso-installer --flake .#live-iso
--- a/lib/autoDir.nix
+++ b/lib/autoDir.nix
@@ -1,15 +1,21 @@
 lib:

-# import all .nix files in dir as attribute set
+# auto-discover nix modules from a directory
+# - flat .nix files (excluding default.nix) are imported directly
+# - subdirectories containing package.nix are imported via package.nix
 dir:
 let
  readDir = builtins.readDir dir;
-  files = lib.attrNames (
-    lib.filterAttrs (
-      name: type: type == "regular" && lib.hasSuffix ".nix" name && name != "default.nix"
-    ) readDir
-  );

-  packages = builtins.map (name: lib.removeSuffix ".nix" name) files;
+  files = lib.filterAttrs (
+    name: type: type == "regular" && lib.hasSuffix ".nix" name && name != "default.nix"
+  ) readDir;
+
+  dirs = lib.filterAttrs (
+    name: type: type == "directory" && builtins.pathExists (dir + "/${name}/package.nix")
+  ) readDir;
 in
-lib.genAttrs packages (name: import (dir + "/${name}.nix"))
+lib.mapAttrs' (
+  name: _: lib.nameValuePair (lib.removeSuffix ".nix" name) (import (dir + "/${name}"))
+) files
+// lib.mapAttrs (name: _: import (dir + "/${name}/package.nix")) dirs
--- a/packages/ahab/package.nix
+++ b/packages/ahab/package.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:

 let
-  version = "v0.4.1";
+  version = "v0.4.2";
 in
 pkgs.rustPlatform.buildRustPackage {
  pname = "ahab";
@@ -12,10 +12,10 @@ pkgs.rustPlatform.buildRustPackage {
    owner = "janezicmatej";
    repo = "ahab";
    rev = version;
-    sha256 = "sha256-Y8UqZOskSlt8GrYem97yKXNbGkd6Ab7WRynKEA9w16E=";
+    sha256 = "sha256-hJg6vRaqTu9a3fua2J/e6akdJQffAk6TBAzJRBD5qHQ=";
  };

-  cargoHash = "sha256-T5r+Og3+mHMsqCFGi+QzHdN2MgvPxzA/R+xu38I+lcg=";
+  cargoHash = "sha256-T/2+kxa5X2fmMQs023JN9ZDihExfYvPnunJ8b2Irwoo=";

  buildType = "debug";

--- a/packages/ahab/update.sh
+++ b/packages/ahab/update.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-prefetch
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PKG_FILE="$SCRIPT_DIR/package.nix"
+
+cd "$ROOT_DIR"
+
+extract_hash() {
+  sed 's/\x1b\[[0-9;]*m//g' | grep 'got:' | tail -1 | grep -oP 'sha256-[A-Za-z0-9+/]+='
+}
+
+echo "fetching latest version..."
+LATEST=$(curl -sf "https://git.janezic.dev/api/v1/repos/janezicmatej/ahab/tags?limit=1" | jq -r '.[0].name')
+CURRENT=$(grep 'version = ' "$PKG_FILE" | head -1 | sed 's/.*"\(.*\)".*/\1/')
+
+if [[ "$CURRENT" == "$LATEST" ]]; then
+  echo "ahab already at $LATEST"
+  exit 0
+fi
+
+echo "updating ahab: $CURRENT -> $LATEST"
+
+echo "  prefetching source..."
+BASE32=$(nix-prefetch-url --unpack "https://git.janezic.dev/janezicmatej/ahab/archive/${LATEST}.tar.gz" 2>/dev/null)
+SRC_HASH=$(nix hash convert --to sri "sha256:$BASE32")
+echo "  source: $SRC_HASH"
+
+echo "  computing cargo hash..."
+BUILD_OUTPUT=$(nix build --no-link --impure --expr "
+  let
+    pkgs = (builtins.getFlake \"path:$ROOT_DIR\").inputs.nixpkgs.legacyPackages.\${builtins.currentSystem};
+  in pkgs.rustPlatform.fetchCargoVendor {
+    src = pkgs.fetchFromGitea {
+      domain = \"git.janezic.dev\";
+      owner = \"janezicmatej\";
+      repo = \"ahab\";
+      rev = \"$LATEST\";
+      hash = \"$SRC_HASH\";
+    };
+    hash = \"\";
+  }
+" 2>&1) || true
+CARGO_HASH=$(echo "$BUILD_OUTPUT" | extract_hash) || true
+
+if [[ -z "$CARGO_HASH" ]]; then
+  echo "  error: failed to compute cargo hash"
+  echo "$BUILD_OUTPUT"
+  exit 1
+fi
+echo "  cargo: $CARGO_HASH"
+
+OLD_SRC=$(grep 'sha256 = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+OLD_CARGO=$(grep 'cargoHash = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+
+sed -i "s|version = \"$CURRENT\"|version = \"$LATEST\"|" "$PKG_FILE"
+sed -i "s|$OLD_SRC|$SRC_HASH|" "$PKG_FILE"
+sed -i "s|$OLD_CARGO|$CARGO_HASH|" "$PKG_FILE"
+
+echo "ahab updated to $LATEST"
--- a/packages/ca-matheo-si/package.nix
+++ b/packages/ca-matheo-si/package.nix
--- a/packages/ggman/package.nix
+++ b/packages/ggman/package.nix
@@ -2,7 +2,7 @@

 let
  pkgs = pkgs-master;
-  version = "e24855c";
+  version = "v1.27.1";
 in
 pkgs.buildGoModule.override
  {
@@ -16,10 +16,10 @@ pkgs.buildGoModule.override
      owner = "tkw1536";
      repo = "ggman";
      rev = version;
-      sha256 = "sha256-H78xtF7l5joX3/qDFaRIT4LyZpHmm6DMR4JIKzNO7c0=";
+      sha256 = "sha256-z7zqV69rPYwtkm4ieF+FIssBsFbREvaYQzSF648DHK0=";
    };

-    vendorHash = "sha256-w8NrOt0xtn+/gugJ4amzdJP70Y5KHe5DlhsEprycm3U=";
+    vendorHash = "sha256-5c5EgYjZXfexWMrUDS4fo46GCJBmFuWkw0cVqqGT7Ik=";
    subPackages = [ "cmd/ggman" ];

    ldflags = [
--- a/packages/ggman/update.sh
+++ b/packages/ggman/update.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-prefetch
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PKG_FILE="$SCRIPT_DIR/package.nix"
+
+cd "$ROOT_DIR"
+
+extract_hash() {
+  sed 's/\x1b\[[0-9;]*m//g' | grep 'got:' | tail -1 | grep -oP 'sha256-[A-Za-z0-9+/]+='
+}
+
+echo "fetching latest tag..."
+LATEST=$(curl -sf "https://api.github.com/repos/tkw1536/ggman/tags?per_page=1" | jq -r '.[0].name')
+CURRENT=$(grep 'version = ' "$PKG_FILE" | head -1 | sed 's/.*"\(.*\)".*/\1/')
+
+if [[ "$CURRENT" == "$LATEST" ]]; then
+  echo "ggman already at $LATEST"
+  exit 0
+fi
+
+echo "updating ggman: $CURRENT -> $LATEST"
+
+echo "  prefetching source..."
+BASE32=$(nix-prefetch-url --unpack "https://github.com/tkw1536/ggman/archive/${LATEST}.tar.gz" 2>/dev/null)
+SRC_HASH=$(nix hash convert --to sri "sha256:$BASE32")
+echo "  source: $SRC_HASH"
+
+echo "  computing vendor hash..."
+BUILD_OUTPUT=$(nix build --no-link --impure --expr "
+  let
+    pkgs = (builtins.getFlake \"path:$ROOT_DIR\").inputs.nixpkgs-master.legacyPackages.\${builtins.currentSystem};
+  in (pkgs.buildGoModule.override { go = pkgs.go_1_26; } {
+    pname = \"ggman\";
+    version = \"$LATEST\";
+    src = pkgs.fetchFromGitHub {
+      owner = \"tkw1536\";
+      repo = \"ggman\";
+      rev = \"$LATEST\";
+      hash = \"$SRC_HASH\";
+    };
+    vendorHash = \"\";
+  }).goModules
+" 2>&1) || true
+VENDOR_HASH=$(echo "$BUILD_OUTPUT" | extract_hash) || true
+
+if [[ -z "$VENDOR_HASH" ]]; then
+  echo "  error: failed to compute vendor hash"
+  echo "$BUILD_OUTPUT"
+  exit 1
+fi
+echo "  vendor: $VENDOR_HASH"
+
+OLD_SRC=$(grep 'sha256 = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+OLD_VENDOR=$(grep 'vendorHash = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+
+sed -i "s|version = \"$CURRENT\"|version = \"$LATEST\"|" "$PKG_FILE"
+sed -i "s|$OLD_SRC|$SRC_HASH|" "$PKG_FILE"
+sed -i "s|$OLD_VENDOR|$VENDOR_HASH|" "$PKG_FILE"
+
+echo "ggman updated to $LATEST"
--- a/packages/git-linearize/package.nix
+++ b/packages/git-linearize/package.nix
--- a/packages/todo-mcp/package.nix
+++ b/packages/todo-mcp/package.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:

 let
-  version = "v0.2.1";
+  version = "v0.3.1";
 in
 pkgs.rustPlatform.buildRustPackage {
  pname = "todo-mcp";
@@ -12,10 +12,10 @@ pkgs.rustPlatform.buildRustPackage {
    owner = "janezicmatej";
    repo = "todo-mcp";
    rev = version;
-    sha256 = "sha256-BBL7PAgTdGR/+vEJmot8c8mgw5vq5Y/szud0YEiR1UY=";
+    sha256 = "sha256-FLsPatHeWcDMLaGZS91aaXtZEful5frN2pqZkQN9vNs=";
  };

-  cargoHash = "sha256-uAyD7Tj9qctDXQ5NkR6T/aItxRmd5WqIXr7NeOlCl8M=";
+  cargoHash = "sha256-gdR4p5LIEMGBV3ikuuRZ5R8CYIjE1K2OnMJm7yo18Nw=";

  nativeBuildInputs = [ pkgs.installShellFiles ];

--- a/packages/todo-mcp/update.sh
+++ b/packages/todo-mcp/update.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-prefetch
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+PKG_FILE="$SCRIPT_DIR/package.nix"
+
+cd "$ROOT_DIR"
+
+extract_hash() {
+  sed 's/\x1b\[[0-9;]*m//g' | grep 'got:' | tail -1 | grep -oP 'sha256-[A-Za-z0-9+/]+='
+}
+
+echo "fetching latest version..."
+LATEST=$(curl -sf "https://git.janezic.dev/api/v1/repos/janezicmatej/todo-mcp/tags?limit=1" | jq -r '.[0].name')
+CURRENT=$(grep 'version = ' "$PKG_FILE" | head -1 | sed 's/.*"\(.*\)".*/\1/')
+
+if [[ "$CURRENT" == "$LATEST" ]]; then
+  echo "todo-mcp already at $LATEST"
+  exit 0
+fi
+
+echo "updating todo-mcp: $CURRENT -> $LATEST"
+
+echo "  prefetching source..."
+BASE32=$(nix-prefetch-url --unpack "https://git.janezic.dev/janezicmatej/todo-mcp/archive/${LATEST}.tar.gz" 2>/dev/null)
+SRC_HASH=$(nix hash convert --to sri "sha256:$BASE32")
+echo "  source: $SRC_HASH"
+
+echo "  computing cargo hash..."
+BUILD_OUTPUT=$(nix build --no-link --impure --expr "
+  let
+    pkgs = (builtins.getFlake \"path:$ROOT_DIR\").inputs.nixpkgs.legacyPackages.\${builtins.currentSystem};
+  in pkgs.rustPlatform.fetchCargoVendor {
+    src = pkgs.fetchFromGitea {
+      domain = \"git.janezic.dev\";
+      owner = \"janezicmatej\";
+      repo = \"todo-mcp\";
+      rev = \"$LATEST\";
+      hash = \"$SRC_HASH\";
+    };
+    hash = \"\";
+  }
+" 2>&1) || true
+CARGO_HASH=$(echo "$BUILD_OUTPUT" | extract_hash) || true
+
+if [[ -z "$CARGO_HASH" ]]; then
+  echo "  error: failed to compute cargo hash"
+  echo "$BUILD_OUTPUT"
+  exit 1
+fi
+echo "  cargo: $CARGO_HASH"
+
+OLD_SRC=$(grep 'sha256 = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+OLD_CARGO=$(grep 'cargoHash = ' "$PKG_FILE" | grep -oP 'sha256-[A-Za-z0-9+/]+=')
+
+sed -i "s|version = \"$CURRENT\"|version = \"$LATEST\"|" "$PKG_FILE"
+sed -i "s|$OLD_SRC|$SRC_HASH|" "$PKG_FILE"
+sed -i "s|$OLD_CARGO|$CARGO_HASH|" "$PKG_FILE"
+
+echo "todo-mcp updated to $LATEST"
Author	SHA1	Message	Date
Matej Janežič	f743082fd4	chore: bump lockfile	2026-03-02 15:31:06 +01:00
Matej Janežič	d813060f1e	fix: autoDir for packages and flat directories	2026-03-02 15:30:34 +01:00
Matej Janežič	2ae02f0441	feat: bump ahab to v0.4.2	2026-03-02 14:53:58 +01:00
Matej Janežič	8e749c9fff	feat: bump todo-mcp to v0.3.1	2026-03-02 14:48:54 +01:00
Matej Janežič	7f24c46ee2	feat: bump ggman to v1.27.1	2026-03-02 14:48:49 +01:00
Matej Janežič	0af754704e	feat: refactor packages and add update scripts	2026-03-02 14:48:13 +01:00