diff --git a/nixos-module.nix b/nixos-module.nix index 898a8ab..34612a3 100644 --- a/nixos-module.nix +++ b/nixos-module.nix @@ -1,21 +1,21 @@ -{ pkgs , ... } : +{ pkgs, ... }: -with pkgs ; +with pkgs; { nixpkgs = { overlays = [ - ( self : super : { + ( self: super: { journalctl-last-invocation = callPackage ( import packages/journalctl-last-invocation/package.nix - ) {} ; + ) {}; nix-store-fuzzy-find = callPackage ( import packages/nix-store-fuzzy-find/package.nix - ) {} ; + ) {}; - } ) - ] ; - } ; + }) + ]; + }; } diff --git a/packages/journalctl-last-invocation/package.nix b/packages/journalctl-last-invocation/package.nix index 35c1d44..22cf1f9 100644 --- a/packages/journalctl-last-invocation/package.nix +++ b/packages/journalctl-last-invocation/package.nix @@ -1,24 +1,24 @@ -{ pkgs , stdenv } : +{ pkgs, stdenv }: -with pkgs ; -with stdenv ; +with pkgs; +with stdenv; mkDerivation { - pname = "journalctl-last-invocation" ; - version = "2025-03-10" ; + pname = "journalctl-last-invocation"; + version = "2026-04-29"; - phases = [ "createSourcesPhase" "installPhase" ] ; + phases = [ "createSourcesPhase" "installPhase" ]; createSourcesPhase = '' - # Same directory structure that `unpackPhase` would use + # Same directory structure that `unpackPhase` would use. mkdir -p /build/source cat <<- EOF > /build/source/journalctl-last-invocation #!${bash}/bin/sh - exec ${systemd}/bin/journalctl _SYSTEMD_INVOCATION_ID=\$( ${systemd}/bin/systemctl show --value --property=InvocationID \$1 ) + exec ${systemd}/bin/journalctl _SYSTEMD_INVOCATION_ID=\$(${systemd}/bin/systemctl show --value --property=InvocationID \$1) EOF - '' ; + ''; installPhase = '' mkdir -p $out/bin @@ -26,5 +26,5 @@ mkDerivation { cp /build/source/journalctl-last-invocation $out/bin/ chmod +x $out/bin/journalctl-last-invocation - '' ; + ''; } diff --git a/packages/nix-store-fuzzy-find/package.nix b/packages/nix-store-fuzzy-find/package.nix index 3639839..c7dff8c 100644 --- a/packages/nix-store-fuzzy-find/package.nix +++ b/packages/nix-store-fuzzy-find/package.nix @@ -1,16 +1,16 @@ -{ pkgs , stdenv } : +{ pkgs, stdenv }: -with pkgs ; -with stdenv ; +with pkgs; +with stdenv; mkDerivation { - pname = "nix-store-fuzzy-find" ; - version = "2025-03-09" ; + pname = "nix-store-fuzzy-find"; + version = "2026-04-29"; - phases = [ "createSourcesPhase" "installPhase" ] ; + phases = [ "createSourcesPhase" "installPhase" ]; createSourcesPhase = '' - # Same directory structure that `unpackPhase` would use + # Same directory structure that `unpackPhase` would use. mkdir -p /build/source cat <<- EOF > /build/source/nix-store-fuzzy-find @@ -18,7 +18,7 @@ mkDerivation { exec ${findutils}/bin/find /nix/store -maxdepth 1 -type d -name "*-\$1-*" EOF - '' ; + ''; installPhase = '' mkdir -p $out/bin @@ -26,5 +26,5 @@ mkDerivation { cp /build/source/nix-store-fuzzy-find $out/bin/ chmod +x $out/bin/nix-store-fuzzy-find - '' ; + ''; } diff --git a/readme.md b/readme.md index 3027981..1319c8e 100644 --- a/readme.md +++ b/readme.md @@ -32,18 +32,18 @@ Using the top-level NixOS module: ```nix imports = [ - ( fetchTarball { - url = "https://kernelmaft.com/forgejo/zedfrigg/nix-packages/archive/f91196c8a4a3ba6953c85b94ea75dee5e331548f.tar.gz" ; - sha256 = "sha256:1wx7ljabgndandcd11jmr590jfpkhs55mqrgksf24ji90m37wpq0" ; - } + "/nixos-module.nix" ) -] ; + (fetchTarball { + url = "https://kernelmaft.com/forgejo/zedfrigg/nix-packages/archive/f91196c8a4a3ba6953c85b94ea75dee5e331548f.tar.gz"; + sha256 = "sha256:1wx7ljabgndandcd11jmr590jfpkhs55mqrgksf24ji90m37wpq0"; + } + "/nixos-module.nix") +]; ``` Using a specific package expression: ```nix -pkgs . callPackage ( import ( pkgs . fetchurl { - url = "https://kernelmaft.com/forgejo/zedfrigg/nix-packages/raw/commit/c45884c66f31f8d8d80866bebc13e9e963e02a70/packages/python3.11-django-imagekit/package.nix" ; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" ; -} ) ) {} +pkgs.callPackage (import (pkgs.fetchurl { + url = "https://kernelmaft.com/forgejo/zedfrigg/nix-packages/raw/commit/c45884c66f31f8d8d80866bebc13e9e963e02a70/packages/python3.11-django-imagekit/package.nix"; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; +})) {} ```